kotovalexarian-likes-github/heartcombo--devise
1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00
Code Releases Activity

Rename variable to views, change flag to -v

Browse source
This commit is contained in:
Molly Trombley-McCann and Shatarupa Nandi 2014-03-06 13:41:11 -08:00
parent 3640abc933
commit a79e0f6bca
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/generators/devise/views_generator.rb
View file

@ -16,7 +16,7 @@ module Devise
# It should be fixed in future Rails releases
class_option :form_builder, aliases: "-b"
class_option :markerb
class_option :selective, aliases: "-d", type: :array, desc: "Select specific view directories to generate (confirmations, passwords, registrations, sessions, unlocks, mailer)"
class_option :views, aliases: "-v", type: :array, desc: "Select specific view directories to generate (confirmations, passwords, registrations, sessions, unlocks, mailer)"
public_task :copy_views
end
@ -29,8 +29,8 @@ module Devise
end
def copy_views
if options[:selective]
options[:selective].each do |directory|
if options[:views]
options[:views].each do |directory|
view_directory directory.to_sym
end
else
@ -92,7 +92,7 @@ module Devise
hide!
def copy_views
if !options[:selective] || options[:selective].include?('mailer')
if !options[:views] || options[:views].include?('mailer')
view_directory :mailer
end
end
@ -105,7 +105,7 @@ module Devise
hide!
def copy_views
if !options[:selective] || options[:selective].include?('mailer')
if !options[:views] || options[:views].include?('mailer')
view_directory :markerb, target_path
end
end

8
test/generators/views_generator_test.rb
View file

@ -38,7 +38,7 @@ class ViewsGeneratorTest < Rails::Generators::TestCase
test "Assert only views within specified directories" do
run_generator %w(-d sessions registrations)
run_generator %w(-v sessions registrations)
assert_file "app/views/devise/sessions/new.html.erb"
assert_file "app/views/devise/registrations/new.html.erb"
assert_file "app/views/devise/registrations/edit.html.erb"
@ -47,19 +47,19 @@ class ViewsGeneratorTest < Rails::Generators::TestCase
end
test "Assert specified directories with scope" do
run_generator %w(users -d sessions)
run_generator %w(users -v sessions)
assert_file "app/views/users/sessions/new.html.erb"
assert_no_file "app/views/users/confirmations/new.html.erb"
end
test "Assert specified directories with simple form" do
run_generator %w(-d registrations -b simple_form_for)
run_generator %w(-v registrations -b simple_form_for)
assert_file "app/views/devise/registrations/new.html.erb", /simple_form_for/
assert_no_file "app/views/devise/confirmations/new.html.erb"
end
test "Assert specified directories with markerb" do
run_generator %w(--markerb -d passwords mailer)
run_generator %w(--markerb -v passwords mailer)
assert_file "app/views/devise/passwords/new.html.erb"
assert_no_file "app/views/devise/confirmations/new.html.erb"
assert_file "app/views/devise/mailer/reset_password_instructions.markerb"