Merge pull request #1741 from padrino/fix-thor-test

Fix tests related to the thor generator
padrino · Aug 13, 2014 · 6ac0114 · 6ac0114
2 parents 1bb7bf8 + f5eafea
commit 6ac0114
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 28 deletions.
diff --git a/padrino-admin/test/generators/test_admin_app_generator.rb b/padrino-admin/test/generators/test_admin_app_generator.rb
@@ -208,11 +208,8 @@
         seeds_rb.puts "# Old Seeds Content"
       end
 
-      capture_io do
-        $stdout.expects(:print).with { |value| value =~ /Overwrite\s.*?\/db\/seeds.rb/ }.never
-        $stdin.stubs(:gets).returns('y')
-        generate(:admin_app, "--root=#{@apptmp}/sample_project")
-      end
+      out, err = capture_io { generate(:admin_app, "--root=#{@apptmp}/sample_project") }
+      refute_match /Overwrite\s.*?\/db\/seeds.rb/, out
 
       assert_file_exists "#{@apptmp}/sample_project/db/seeds.old"
       assert_match_in_file 'Account.create(', "#{@apptmp}/sample_project/db/seeds.rb"

diff --git a/padrino-gen/test/test_component_generator.rb b/padrino-gen/test/test_component_generator.rb
@@ -79,25 +79,21 @@ def teardown
       capture_io { generate(:project, 'sample_project', '-renderer=slim', "--root=#{@apptmp}") }
       components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
       assert_equal 'slim', components_chosen[:renderer]
-      $stdin.stub(:gets, 'yes') do
-        out, err = capture_io { generate(:component, '--renderer=haml', "-r=#{@apptmp}/sample_project") }
-        assert_match(/applying.*?haml.*?renderer/, out)
-        assert_match(/Switch renderer to/, out)
-        components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
-        assert_equal 'haml', components_chosen[:renderer]
-      end
+      Readline.stubs(:readline).returns('yes').once
+      out, err = capture_io { generate(:component, '--renderer=haml', "-r=#{@apptmp}/sample_project") }
+      assert_match(/applying.*?haml.*?renderer/, out)
+      components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
+      assert_equal 'haml', components_chosen[:renderer]
     end
     it 'should when deny changes, will not be applied' do
       capture_io { generate(:project, 'sample_project', '-renderer=slim', "--root=#{@apptmp}") }
       components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
       assert_equal 'slim', components_chosen[:renderer]
-      $stdin.stub(:gets, 'no') do
-        out, err = capture_io { generate(:component, '--renderer=haml', "-r=#{@apptmp}/sample_project") }
-        refute_match(/applying.*?haml.*?renderer/, out)
-        assert_match(/Switch renderer to/, out)
-        components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
-        assert_equal 'slim', components_chosen[:renderer]
-      end
+      Readline.stubs(:readline).returns('no').once
+      out, err = capture_io { generate(:component, '--renderer=haml', "-r=#{@apptmp}/sample_project") }
+      refute_match(/applying.*?haml.*?renderer/, out)
+      components_chosen = YAML.load_file("#{@apptmp}/sample_project/.components")
+      assert_equal 'slim', components_chosen[:renderer]
     end
   end
 

diff --git a/padrino-gen/test/test_model_generator.rb b/padrino-gen/test/test_model_generator.rb
@@ -57,15 +57,6 @@ def teardown
       assert_match_in_file(/DataMapper.finalize/m,"#{@apptmp}/sample_project/config/boot.rb")
     end
 
-    it 'should generate only generate model once' do
-      capture_io { generate(:project, 'sample_project', "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
-      response_success = capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
-      out, err = capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }
-      assert_match_in_file(/class User < ActiveRecord::Base/m, "#{@apptmp}/sample_project/models/user.rb")
-      assert_match(/identical\e\[0m  models\/user\.rb/, out)
-      assert_match(/identical\e\[0m  test\/models\/user_test\.rb/, out)
-    end
-
     it 'should generate migration file versions properly' do
       capture_io { generate(:project, 'sample_project', "--migration_format=number", "--root=#{@apptmp}", '--script=none', '-t=bacon', '-d=activerecord') }
       capture_io { generate(:model, 'user', "-r=#{@apptmp}/sample_project") }