coulda update

Dan Croak
1 parent 242338c5
Showing 2 changed files with 12 additions and 9 deletions Show diff stats
vendor/plugins/coulda/generators/feature/feature_generator.rb
vendor/plugins/coulda/generators/support/insert_commands.rb
@@ -14,7 +14,7 @@ class FeatureGenerator &lt; Rails::Generator::NamedBase
       m.template 'step_definition.rb', path
  
       path = File.join('features', 'support', "paths.rb")
-      m.insert_into path, insertable_path
+      m.insert_cucumber_path path, insertable_path
     end
   end
  
@@ -10,14 +10,17 @@ Rails::Generator::Commands::Create.class_eval do
   def insert_into(file, line)
     logger.insert "#{line} into #{file}"
     unless file_contains?(file, line)
-      if file =~ /^module NavigationHelpers/
-        gsub_file file, /#{Coulda::Insertable.cucumber_paths}/ do |match|
-          "#{match}\n#{line}"
-        end
-      else
-        gsub_file file, /^(class|module|#{Coulda::Insertable.routes}) .+$/ do |match|
-          "#{match}\n  #{line}"
-        end
+      gsub_file file, /^(class|module|#{Coulda::Insertable.routes}) .+$/ do |match|
+        "#{match}\n  #{line}"
+      end
+    end
+  end
+
+  def insert_cucumber_path(file, line)
+    logger.insert "#{line} into #{file}"
+    unless file_contains?(file, line)
+      gsub_file file, /#{Coulda::Insertable.cucumber_paths}/ do |match|
+        "#{match}\n#{line}"
       end
     end
   end
...	...	@@ -14,7 +14,7 @@ class FeatureGenerator < Rails::Generator::NamedBase
14	14	m.template 'step_definition.rb', path
15	15
16	16	path = File.join('features', 'support', "paths.rb")
17		- m.insert_into path, insertable_path
	17	+ m.insert_cucumber_path path, insertable_path
18	18	end
19	19	end
20	20
...	...
...	...	@@ -10,14 +10,17 @@ Rails::Generator::Commands::Create.class_eval do
10	10	def insert_into(file, line)
11	11	logger.insert "#{line} into #{file}"
12	12	unless file_contains?(file, line)
13		- if file =~ /^module NavigationHelpers/
14		- gsub_file file, /#{Coulda::Insertable.cucumber_paths}/ do \|match\|
15		- "#{match}\n#{line}"
16		- end
17		- else
18		- gsub_file file, /^(class\|module\|#{Coulda::Insertable.routes}) .+$/ do \|match\|
19		- "#{match}\n #{line}"
20		- end
	13	+ gsub_file file, /^(class\|module\|#{Coulda::Insertable.routes}) .+$/ do \|match\|
	14	+ "#{match}\n #{line}"
	15	+ end
	16	+ end
	17	+ end
	18	+
	19	+ def insert_cucumber_path(file, line)
	20	+ logger.insert "#{line} into #{file}"
	21	+ unless file_contains?(file, line)
	22	+ gsub_file file, /#{Coulda::Insertable.cucumber_paths}/ do \|match\|
	23	+ "#{match}\n#{line}"
21	24	end
22	25	end
23	26	end
...	...