Skip to content

Commit 2520e26

Browse files
jonasjabarijonasjabari
authored
Merge pull request #396 from matestack/fix_242_scaffolder_ci
Fix 242 scaffolder ci
2 parents 61142d4 + f5510f0 commit 2520e26

File tree

5 files changed

+141
-141
lines changed

5 files changed

+141
-141
lines changed

‎.github/workflows/dockerpush.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ jobs:
1212
- name: Run tests
1313
run: |
1414
docker-compose run --rm test bundle exec rake db:schema:load
15-
docker-compose run --rm test bundle exec rspec spec/usage
15+
docker-compose run --rm test bundle exec rspec spec/usage spec/lib

‎spec/lib/generators/matestack/app/app_generator_spec.rb

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
# require 'generator_spec'
2-
# require 'generators/matestack/app/app_generator'
1+
require 'generator_spec'
2+
require 'generators/matestack/app/app_generator'
33

4-
# describe Matestack::Generators::AppGenerator, type: :generator do
5-
# let(:dummy) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', 'dummy')) }
6-
# let(:dummy_copy) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', 'dummy_copy')) }
4+
describe Matestack::Generators::AppGenerator, type: :generator do
5+
let(:dummy) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', 'dummy')) }
6+
let(:dummy_copy) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', 'dummy_copy')) }
77

8-
# before :each do
9-
# FileUtils.cp_r dummy, dummy_copy
10-
# end
8+
before :each do
9+
FileUtils.cp_r dummy, dummy_copy
10+
end
1111

12-
# after :each do
13-
# FileUtils.rm_rf dummy
14-
# FileUtils.cp_r dummy_copy, dummy
15-
# FileUtils.rm_rf dummy_copy
16-
# end
12+
after :each do
13+
FileUtils.rm_rf dummy
14+
FileUtils.cp_r dummy_copy, dummy
15+
FileUtils.rm_rf dummy_copy
16+
end
1717

18-
# destination Rails.root
18+
destination Rails.root
1919

20-
# it "creates an example app" do
21-
# run_generator %w(my_example_app)
20+
it "creates an example app" do
21+
run_generator %w(my_example_app)
2222

23-
# assert_file "app/matestack/apps/my_example_app.rb", /class Apps::MyExampleApp < Matestack::Ui::App\b/
24-
# end
23+
assert_file "app/matestack/apps/my_example_app.rb", /class Apps::MyExampleApp < Matestack::Ui::App\b/
24+
end
2525

26-
# it "creates an example app with --all_inclusive flag" do
27-
# run_generator %w(my_example_app --all_inclusive)
26+
it "creates an example app with --all_inclusive flag" do
27+
run_generator %w(my_example_app --all_inclusive)
2828

29-
# assert_file "app/matestack/apps/my_example_app.rb", /class Apps::MyExampleApp < Matestack::Ui::App\b/
30-
# assert_file "app/controllers/my_example_app_controller.rb", /class MyExampleAppController < ApplicationController\b/
31-
# assert_file "config/routes.rb", /my_example_app\b/
32-
# assert_file "app/matestack/pages/my_example_app/example_page.rb", /class Pages::MyExampleApp::ExamplePage < Matestack::Ui::Page\b/
33-
# end
29+
assert_file "app/matestack/apps/my_example_app.rb", /class Apps::MyExampleApp < Matestack::Ui::App\b/
30+
assert_file "app/controllers/my_example_app_controller.rb", /class MyExampleAppController < ApplicationController\b/
31+
assert_file "config/routes.rb", /my_example_app\b/
32+
assert_file "app/matestack/pages/my_example_app/example_page.rb", /class Pages::MyExampleApp::ExamplePage < Matestack::Ui::Page\b/
33+
end
3434

35-
# end
35+
end

‎spec/lib/generators/matestack/component/component_generator_spec.rb

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
# require "generator_spec"
2-
# require 'generators/matestack/component/component_generator'
1+
require "generator_spec"
2+
require 'generators/matestack/component/component_generator'
33

4-
# describe Matestack::Generators::ComponentGenerator, type: :generator do
5-
# let(:dummy) {File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', 'dummy'))}
6-
# let(:dummy_copy) {File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', 'dummy_copy'))}
4+
describe Matestack::Generators::ComponentGenerator, type: :generator do
5+
let(:dummy) {File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', 'dummy'))}
6+
let(:dummy_copy) {File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', 'dummy_copy'))}
77

8-
# before :each do
9-
# FileUtils.cp_r dummy, dummy_copy
10-
# end
8+
before :each do
9+
FileUtils.cp_r dummy, dummy_copy
10+
end
1111

12-
# after :each do
13-
# FileUtils.rm_rf dummy
14-
# FileUtils.cp_r dummy_copy, dummy
15-
# FileUtils.rm_rf dummy_copy
16-
# end
12+
after :each do
13+
FileUtils.rm_rf dummy
14+
FileUtils.cp_r dummy_copy, dummy
15+
FileUtils.rm_rf dummy_copy
16+
end
1717

18-
# destination Rails.root
18+
destination Rails.root
1919

20-
# it "creates a custom static component" do
21-
# run_generator %w(example_component)
20+
it "creates a custom static component" do
21+
run_generator %w(example_component)
2222

23-
# assert_file "app/matestack/components/example_component.rb", /class Components::ExampleComponent < Matestack::Ui::StaticComponent\b/
24-
# end
23+
assert_file "app/matestack/components/example_component.rb", /class Components::ExampleComponent < Matestack::Ui::StaticComponent\b/
24+
end
2525

26-
# it "creates a custom dynamic component" do
27-
# run_generator %w(example_component --dynamic)
26+
it "creates a custom dynamic component" do
27+
run_generator %w(example_component --dynamic)
2828

29-
# assert_file "app/matestack/components/example_component.rb", /class Components::ExampleComponent < Matestack::Ui::DynamicComponent\b/
30-
# assert_file "app/matestack/components/example_component.js", /custom-example_component\b/
31-
# end
29+
assert_file "app/matestack/components/example_component.rb", /class Components::ExampleComponent < Matestack::Ui::DynamicComponent\b/
30+
assert_file "app/matestack/components/example_component.js", /custom-example_component\b/
31+
end
3232

33-
# it "creates a haml file with the haml option" do
34-
# run_generator %w(example_component --haml)
33+
it "creates a haml file with the haml option" do
34+
run_generator %w(example_component --haml)
3535

36-
# assert_file "app/matestack/components/example_component.haml", %r{.example_component{@tag_attributes}}
37-
# assert_file "app/matestack/components/example_component.haml", /This is your custom ExampleComponent component/
38-
# end
36+
assert_file "app/matestack/components/example_component.haml", %r{.example_component{@tag_attributes}}
37+
assert_file "app/matestack/components/example_component.haml", /This is your custom ExampleComponent component/
38+
end
3939

40-
# it "creates a scss file with the scss option" do
41-
# run_generator %w(example_component --scss)
40+
it "creates a scss file with the scss option" do
41+
run_generator %w(example_component --scss)
4242

43-
# assert_file "app/matestack/components/example_component.scss", %r{// your styles for the component ExampleComponent go here}
44-
# end
43+
assert_file "app/matestack/components/example_component.scss", %r{// your styles for the component ExampleComponent go here}
44+
end
4545

46-
# it "creates a custom component in the right namespace" do
47-
# run_generator %w(example_component --namespace example_namespace --dynamic --scss --haml)
46+
it "creates a custom component in the right namespace" do
47+
run_generator %w(example_component --namespace example_namespace --dynamic --scss --haml)
4848

49-
# assert_file "app/matestack/components/example_namespace/example_component.rb", /class Components::ExampleNamespace::ExampleComponent < Matestack::Ui::DynamicComponent/
50-
# assert_file "app/matestack/components/example_namespace/example_component.js", /custom-example_namespace-example_component/
51-
# assert_file "app/matestack/components/example_namespace/example_component.js", %r{require example_namespace/example_component}
52-
# assert_file "app/matestack/components/example_namespace/example_component.haml"
53-
# assert_file "app/matestack/components/example_namespace/example_component.scss"
54-
# end
49+
assert_file "app/matestack/components/example_namespace/example_component.rb", /class Components::ExampleNamespace::ExampleComponent < Matestack::Ui::DynamicComponent/
50+
assert_file "app/matestack/components/example_namespace/example_component.js", /custom-example_namespace-example_component/
51+
assert_file "app/matestack/components/example_namespace/example_component.js", %r{require example_namespace/example_component}
52+
assert_file "app/matestack/components/example_namespace/example_component.haml"
53+
assert_file "app/matestack/components/example_namespace/example_component.scss"
54+
end
5555

56-
# end
56+
end

‎spec/lib/generators/matestack/core/component/component_generator_spec.rb

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
1-
# # frozen_string_literal: true
1+
# frozen_string_literal: true
22

3-
# require 'generator_spec'
4-
# require 'generators/matestack/core/component/component_generator'
3+
require 'generator_spec'
4+
require 'generators/matestack/core/component/component_generator'
55

6-
# describe Matestack::Core::Generators::ComponentGenerator, type: :generator do
7-
# let(:dummy) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', '..', 'dummy')) }
8-
# let(:dummy_copy) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', '..', 'dummy_copy')) }
6+
describe Matestack::Core::Generators::ComponentGenerator, type: :generator do
7+
let(:dummy) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', '..', 'dummy')) }
8+
let(:dummy_copy) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', '..', 'dummy_copy')) }
99

10-
# before :each do
11-
# FileUtils.cp_r dummy, dummy_copy
12-
# end
10+
before :each do
11+
FileUtils.cp_r dummy, dummy_copy
12+
end
1313

14-
# after :each do
15-
# FileUtils.rm_rf dummy
16-
# FileUtils.cp_r dummy_copy, dummy
17-
# FileUtils.rm_rf dummy_copy
18-
# end
14+
after :each do
15+
FileUtils.rm_rf dummy
16+
FileUtils.cp_r dummy_copy, dummy
17+
FileUtils.rm_rf dummy_copy
18+
end
1919

20-
# destination Rails.root
20+
destination Rails.root
2121

22-
# it 'creates a core component' do
23-
# run_generator %w(div)
22+
it 'creates a core component' do
23+
run_generator %w(div)
2424

25-
# assert_file 'app/concepts/matestack/ui/core/div/div.rb', /module Matestack::Ui::Core::Div/
26-
# assert_file 'app/concepts/matestack/ui/core/div/div.rb', /class Div < Matestack::Ui::Core::Component::Static/
25+
assert_file 'app/concepts/matestack/ui/core/div/div.rb', /module Matestack::Ui::Core::Div/
26+
assert_file 'app/concepts/matestack/ui/core/div/div.rb', /class Div < Matestack::Ui::Core::Component::Static/
2727

28-
# assert_file 'app/concepts/matestack/ui/core/div/div.haml', /%div{@tag_attributes}/
28+
assert_file 'app/concepts/matestack/ui/core/div/div.haml', /%div{@tag_attributes}/
2929

30-
# assert_file 'spec/usage/components/div_spec.rb', /describe 'Div component', type: :feature, js: true do/
31-
# assert_file 'spec/usage/components/div_spec.rb', /div text: 'Simple div tag'/
32-
# assert_file 'spec/usage/components/div_spec.rb', %r{<div>Simple div tag</div>}
33-
# assert_file 'spec/usage/components/div_spec.rb', /div id: 'my-id', class: 'my-class' do/
34-
# assert_file 'spec/usage/components/div_spec.rb', %r{<div id="my-id" class="my-class">Enhanced div tag</div>}
30+
assert_file 'spec/usage/components/div_spec.rb', /describe 'Div component', type: :feature, js: true do/
31+
assert_file 'spec/usage/components/div_spec.rb', /div text: 'Simple div tag'/
32+
assert_file 'spec/usage/components/div_spec.rb', %r{<div>Simple div tag</div>}
33+
assert_file 'spec/usage/components/div_spec.rb', /div id: 'my-id', class: 'my-class' do/
34+
assert_file 'spec/usage/components/div_spec.rb', %r{<div id="my-id" class="my-class">Enhanced div tag</div>}
3535

36-
# assert_file 'docs/components/div.md', /# matestack core component: Div/
37-
# assert_file 'docs/components/div.md', %r{Show \[specs\]\(/spec/usage/components/div_spec.rb\)}
38-
# assert_file 'docs/components/div.md', /The HTML `<div>` tag implemented in ruby./
39-
# assert_file 'docs/components/div.md', /Expects a string with all ids the `<div>` should have./
40-
# assert_file 'docs/components/div.md', /Expects a string with all classes the `<div>` should have./
41-
# assert_file 'docs/components/div.md', /div id: 'foo', class: 'bar' do/
42-
# assert_file 'docs/components/div.md', /div id: 'foo', class: 'bar', text: 'Div example 2'/
43-
# assert_file 'docs/components/div.md', /<div id="foo" class="bar">/
36+
assert_file 'docs/components/div.md', /# matestack core component: Div/
37+
assert_file 'docs/components/div.md', %r{Show \[specs\]\(/spec/usage/components/div_spec.rb\)}
38+
assert_file 'docs/components/div.md', /The HTML `<div>` tag implemented in ruby./
39+
assert_file 'docs/components/div.md', /Expects a string with all ids the `<div>` should have./
40+
assert_file 'docs/components/div.md', /Expects a string with all classes the `<div>` should have./
41+
assert_file 'docs/components/div.md', /div id: 'foo', class: 'bar' do/
42+
assert_file 'docs/components/div.md', /div id: 'foo', class: 'bar', text: 'Div example 2'/
43+
assert_file 'docs/components/div.md', /<div id="foo" class="bar">/
4444

45-
# assert_file 'docs/components/README.md', %r{- \[div\]\(/docs/components/div.md\)}
46-
# end
47-
# end
45+
# assert_file 'docs/components/README.md', %r{- \[div\]\(/docs/components/div.md\)}
46+
end
47+
end

‎spec/lib/generators/matestack/page/page_generator_spec.rb

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
1-
# require 'generator_spec'
2-
# require 'generators/matestack/page/page_generator'
1+
require 'generator_spec'
2+
require 'generators/matestack/page/page_generator'
33

4-
# describe Matestack::Generators::PageGenerator, type: :generator do
5-
# let(:dummy) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', 'dummy')) }
6-
# let(:dummy_copy) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', 'dummy_copy')) }
4+
describe Matestack::Generators::PageGenerator, type: :generator do
5+
let(:dummy) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', 'dummy')) }
6+
let(:dummy_copy) { File.expand_path(File.join(__FILE__, '..', '..', '..', '..', '..', 'dummy_copy')) }
77

8-
# before :each do
9-
# FileUtils.cp_r dummy, dummy_copy
10-
# end
8+
before :each do
9+
FileUtils.cp_r dummy, dummy_copy
10+
end
1111

12-
# after :each do
13-
# FileUtils.rm_rf dummy
14-
# FileUtils.cp_r dummy_copy, dummy
15-
# FileUtils.rm_rf dummy_copy
16-
# end
12+
after :each do
13+
FileUtils.rm_rf dummy
14+
FileUtils.cp_r dummy_copy, dummy
15+
FileUtils.rm_rf dummy_copy
16+
end
1717

18-
# destination Rails.root
18+
destination Rails.root
1919

20-
# it "creates example page" do
21-
# run_generator %w(my_example_page --app_name my_app)
20+
it "creates example page" do
21+
run_generator %w(my_example_page --app_name my_app)
2222

23-
# assert_file "app/matestack/pages/my_app/my_example_page.rb", /class Pages::MyApp::MyExamplePage < Matestack::Ui::Page\b/
24-
# assert_file "config/routes.rb", /my_app#my_example_page/
25-
# end
23+
assert_file "app/matestack/pages/my_app/my_example_page.rb", /class Pages::MyApp::MyExamplePage < Matestack::Ui::Page\b/
24+
assert_file "config/routes.rb", /my_app#my_example_page/
25+
end
2626

27-
# it 'create example page with namespace' do
28-
# run_generator %w(my_example_page --app_name my_app --namespace sample_namespace)
27+
it 'create example page with namespace' do
28+
run_generator %w(my_example_page --app_name my_app --namespace sample_namespace)
2929

30-
# assert_file "app/matestack/pages/my_app/sample_namespace/my_example_page.rb", /class Pages::SampleNamespace::MyApp::MyExamplePage < Matestack::Ui::Page\b/
31-
# assert_file "config/routes.rb", %r{my_app/sample_namespace/my_example_page}
32-
# assert_file "config/routes.rb", /my_app#my_example_page/
33-
# end
30+
assert_file "app/matestack/pages/my_app/sample_namespace/my_example_page.rb", /class Pages::SampleNamespace::MyApp::MyExamplePage < Matestack::Ui::Page\b/
31+
assert_file "config/routes.rb", %r{my_app/sample_namespace/my_example_page}
32+
assert_file "config/routes.rb", /my_app#my_example_page/
33+
end
3434

35-
# it 'create example page with controller_action' do
36-
# run_generator %w(my_example_page --app_name my_app --controller_action custom#action)
35+
it 'create example page with controller_action' do
36+
run_generator %w(my_example_page --app_name my_app --controller_action custom#action)
3737

38-
# assert_file "app/matestack/pages/my_app/my_example_page.rb", /class Pages::MyApp::MyExamplePage < Matestack::Ui::Page\b/
39-
# assert_file "config/routes.rb", /custom#action/
40-
# end
38+
assert_file "app/matestack/pages/my_app/my_example_page.rb", /class Pages::MyApp::MyExamplePage < Matestack::Ui::Page\b/
39+
assert_file "config/routes.rb", /custom#action/
40+
end
4141

42-
# it 'create example page with namespace and controller_action' do
43-
# run_generator %w(my_example_page --app_name my_app --namespace sample_namespace --controller_action custom#action)
42+
it 'create example page with namespace and controller_action' do
43+
run_generator %w(my_example_page --app_name my_app --namespace sample_namespace --controller_action custom#action)
4444

45-
# assert_file "app/matestack/pages/my_app/sample_namespace/my_example_page.rb", /class Pages::SampleNamespace::MyApp::MyExamplePage < Matestack::Ui::Page\b/
46-
# assert_file "config/routes.rb", %r{my_app/sample_namespace/my_example_page}
47-
# assert_file "config/routes.rb", /custom#action/
48-
# end
45+
assert_file "app/matestack/pages/my_app/sample_namespace/my_example_page.rb", /class Pages::SampleNamespace::MyApp::MyExamplePage < Matestack::Ui::Page\b/
46+
assert_file "config/routes.rb", %r{my_app/sample_namespace/my_example_page}
47+
assert_file "config/routes.rb", /custom#action/
48+
end
4949

50-
# end
50+
end

0 commit comments

Comments
 (0)