From 6250fa85299cade51bf24e538e9d438bac6174bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Wed, 8 Jun 2011 17:37:49 +0200 Subject: [PATCH] Revert "Merge pull request #1103 from Mab879/master" This reverts commit 944e1c0378fd306560332e334b7003a6bffe742b, reversing changes made to 97659a1193aca1e8d0136e52d036b14473f6dd9b. --- .../devise/controllers_generator.rb | 18 ------------ test/generators/controller_generator_test.rb | 29 ------------------- test/test_helper.rb | 1 - 3 files changed, 48 deletions(-) delete mode 100644 lib/generators/devise/controllers_generator.rb delete mode 100644 test/generators/controller_generator_test.rb diff --git a/lib/generators/devise/controllers_generator.rb b/lib/generators/devise/controllers_generator.rb deleted file mode 100644 index ab8c4e69..00000000 --- a/lib/generators/devise/controllers_generator.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'tmpdir' - -module Devise - module Generators - class ControllersGenerator < Rails::Generators::Base - source_root File.expand_path("../../../../app/controllers", __FILE__) - desc "Copies all Devise controllers to your application." - - argument :scope, :required => false, :default => nil, - :desc => "The scope to copy controllers to" - - - def copy_controllers - directory "devise", "app/controllers/#{scope || :devise}" - end - end - end -end diff --git a/test/generators/controller_generator_test.rb b/test/generators/controller_generator_test.rb deleted file mode 100644 index 2a7d4e85..00000000 --- a/test/generators/controller_generator_test.rb +++ /dev/null @@ -1,29 +0,0 @@ -require "test_helper" - -class ControllersGeneratorTest < Rails::Generators::TestCase - tests Devise::Generators::ControllersGenerator - destination File.expand_path("../../tmp", __FILE__) - setup :prepare_destination - - test "Assert all controllers are properly created with no params" do - run_generator - assert_files - end - - test "Assert all controllers are properly created with scope param param" do - run_generator %w(users) - assert_files "users" - - run_generator %w(admins) - assert_files "admins" - end - - def assert_files(scope = nil, template_engine = nil) - scope = "devise" if scope.nil? - assert_file "app/controllers/#{scope}/confirmations_controller.rb" - assert_file "app/controllers/#{scope}/omniauth_callbacks_controller.rb" - assert_file "app/controllers/#{scope}/passwords_controller.rb" - assert_file "app/controllers/#{scope}/sessions_controller.rb" - assert_file "app/controllers/#{scope}/unlocks_controller.rb" - end -end \ No newline at end of file diff --git a/test/test_helper.rb b/test/test_helper.rb index 14333828..f3659efa 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -25,4 +25,3 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f } require "rails/generators/test_case" require "generators/devise/install_generator" require "generators/devise/views_generator" -require "generators/devise/controllers_generator" \ No newline at end of file