Users can now pass :branch for git plugins and :revision for subversion plugins

[#2352 status:resolved]

Signed-off-by: José Valim <jose.valim@gmail.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 0cda49702b..fdaef6d9cb 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -29,11 +29,26 @@ class ActionsTest < GeneratorsTestCase
     action :plugin, 'restful-authentication', :svn => @svn_plugin_uri
   end
 
+  def test_plugin_with_git_option_and_branch_should_run_plugin_install
+    generator.expects(:run_ruby_script).once.with("script/plugin install -b stable #{@git_plugin_uri}", :verbose => false)
+    action :plugin, 'restful-authentication', :git => @git_plugin_uri, :branch => 'stable'
+  end
+
+  def test_plugin_with_svn_option_and_revision_should_run_plugin_install
+    generator.expects(:run_ruby_script).once.with("script/plugin install -r 1234 #{@svn_plugin_uri}", :verbose => false)
+    action :plugin, 'restful-authentication', :svn => @svn_plugin_uri, :revision => 1234
+  end
+
   def test_plugin_with_git_option_and_submodule_should_use_git_scm
     generator.expects(:run).with("git submodule add #{@git_plugin_uri} vendor/plugins/rest_auth", :verbose => false)
     action :plugin, 'rest_auth', :git => @git_plugin_uri, :submodule => true
   end
 
+  def test_plugin_with_git_option_and_submodule_should_use_git_scm
+    generator.expects(:run).with("git submodule add -b stable #{@git_plugin_uri} vendor/plugins/rest_auth", :verbose => false)
+    action :plugin, 'rest_auth', :git => @git_plugin_uri, :submodule => true, :branch => 'stable'
+  end
+
   def test_plugin_with_no_options_should_skip_method
     generator.expects(:run).never
     action :plugin, 'rest_auth', {}