features/steps/common.rb in newgem-1.0.6 vs features/steps/common.rb in newgem-1.0.7

@@ -7,16 +7,16 @@
   FileUtils.rm_rf   @tmp_root = File.dirname(__FILE__) + "/../../tmp"
   FileUtils.mkdir_p @tmp_root
   @lib_path = File.expand_path(File.dirname(__FILE__) + '/../../lib')
 end
 
-Given /^this project is active project folder/ do
+Given %r{^this project is active project folder} do
   Given "a safe folder"
   @active_project_folder = File.expand_path(File.dirname(__FILE__) + "/../..")
 end
 
-Given /^env variable \$([\w_]+) set to '(.*)'/ do |env_var, value|
+Given %r{^env variable \$([\w_]+) set to '(.*)'} do |env_var, value|
   ENV[env_var] = value
 end
 
 def force_local_lib_override(project_name = @project_name)
   rakefile = File.read(File.join(project_name, 'Rakefile'))
@@ -29,11 +29,11 @@
 def setup_active_project_folder project_name
   @active_project_folder = File.join(@tmp_root, project_name)
   @project_name = project_name
 end
 
-Given /^'(.*)' folder is deleted/ do |folder|
+Given %r{'(.*)' folder is deleted} do |folder|
   in_project_folder do
     FileUtils.rm_rf folder
   end
 end
 
@@ -46,18 +46,18 @@
     end
     run_generator(generator, arguments.split(' '), SOURCES)
   end
 end
 
-When /^run executable '(.*)' with arguments '(.*)'$/ do |executable, arguments|
+When %r{run executable '(.*)' with arguments '(.*)'} do |executable, arguments|
   @stdout = File.expand_path(File.join(@tmp_root, "executable.out"))
   FileUtils.chdir(@active_project_folder) do
     system "ruby #{executable} #{arguments} > #{@stdout}"
   end
 end
 
-When /^task 'rake (.*)' is invoked$/ do |task|
+When %r{^task 'rake (.*)' is invoked$} do |task|
   @stdout = File.expand_path(File.join(@tmp_root, "tests.out"))
   FileUtils.chdir(@active_project_folder) do
     system "rake #{task} --trace > #{@stdout} 2> #{@stdout}"
   end
 end
@@ -72,17 +72,17 @@
   in_project_folder do
     File.exists?(file).should(is == 'is' ? be_true : be_false)
   end
 end
 
-Then /^file matching '(.*)' is created/ do |pattern|
+Then %r{^file with name matching '(.*)' is created} do |pattern|
   in_project_folder do
     Dir[pattern].should_not be_empty
   end
 end
 
-Then /^gem file '(.*)' and generated file '(.*)' should be the same$/ do |gem_file, project_file|
+Then %r{gem file '(.*)' and generated file '(.*)' should be the same} do |gem_file, project_file|
   File.exists?(gem_file).should be_true
   File.exists?(project_file).should be_true
   gem_file_contents = File.read(File.dirname(__FILE__) + "/../../#{gem_file}")
   project_file_contents = File.read(File.join(@active_project_folder, project_file))
   project_file_contents.should == gem_file_contents
@@ -99,58 +99,58 @@
   does_invoke == "does" ?
     actual_output.should(match(/dependency\s+#{generator}/)) :
     actual_output.should_not(match(/dependency\s+#{generator}/))
 end
 
-Then /^help options '(.*)' and '(.*)' are displayed$/ do |opt1, opt2|
+Then %r{help options '(.*)' and '(.*)' are displayed} do |opt1, opt2|
   actual_output = File.read(@stdout)
   actual_output.should match(/#{opt1}/)
   actual_output.should match(/#{opt2}/)
 end
 
-Then /^output (does|does not) match \/(.*)\/$/ do |does, regex|
+Then %r{^output (does|does not) match \/(.*)\/} do |does, regex|
   actual_output = File.read(@stdout)
   (does == 'does') ?
     actual_output.should(match(/#{regex}/)) :
     actual_output.should_not(match(/#{regex}/)) 
 end
 
-Then /^all (\d+) tests pass$/ do |expected_test_count|
+Then %r{^all (\d+) tests pass} do |expected_test_count|
   expected = %r{^#{expected_test_count} tests, \d+ assertions, 0 failures, 0 errors}
   actual_output = File.read(@stdout)
   actual_output.should match(expected)
 end
 
-Then /^all (\d+) examples pass$/ do |expected_test_count|
+Then %r{^all (\d+) examples pass} do |expected_test_count|
   expected = %r{^#{expected_test_count} examples?, 0 failures}
   actual_output = File.read(@stdout)
   actual_output.should match(expected)
 end
 
-Then /^yaml file '(.*)' contains (\{.*\})/ do |file, yaml|
+Then %r{^yaml file '(.*)' contains (\{.*\})} do |file, yaml|
   in_project_folder do
     yaml = eval yaml
     YAML.load(File.read(file)).should == yaml
   end
 end
 
-Then /^Rakefile can display tasks successfully$/ do
+Then %r{^Rakefile can display tasks successfully} do
   @stdout = File.expand_path(File.join(@tmp_root, "rakefile.out"))
   FileUtils.chdir(@active_project_folder) do
     system "rake -T > #{@stdout} 2> #{@stdout}"
   end
   actual_output = File.read(@stdout)
   actual_output.should match(/^rake\s+\w+\s+#\s.*/)
 end
 
-Then /^task 'rake (.*)' is executed successfully$/ do |task|
+Then %r{^task 'rake (.*)' is executed successfully} do |task|
   @stdout.should_not be_nil
   actual_output = File.read(@stdout)
   actual_output.should_not match(/^Don't know how to build task '#{task}'/)
   actual_output.should_not match(/Error/i)
 end
 
-Then /^gem spec key '(.*)' contains \/(.*)\/$/ do |key, regex|
+Then %r{^gem spec key '(.*)' contains \/(.*)\/} do |key, regex|
   in_project_folder do
     gem_file = Dir["pkg/*.gem"].first
     gem_spec = Gem::Specification.from_yaml(`gem spec #{gem_file}`)
     spec_value = gem_spec.send(key.to_sym)
     spec_value.to_s.should match(/#{regex}/)