Browse files

Merge branch 'cucumber-master'

Conflicts:
	History.txt
  • Loading branch information...
2 parents cdf3eed + ab894f8 commit 7b533366e22799e824b155e9562d84ceceb3dff2 @bmabey bmabey committed Apr 16, 2009
View
5 History.txt
@@ -2,7 +2,12 @@
=== New features
=== Bufixes
+
+ == 0.1.3 2009-4-15
+
+ === Bufixes
* Fixed regular expressions in genertaed steps. (Ben Mabey)
+ * World semantics changed in cucumber (0.2.3.2), email_spec now uses the new API. (Hector Morales)
== 0.1.2 2009-4-05
View
2 examples/rails_root/features/step_definitions/email_steps.rb
@@ -18,7 +18,7 @@ def current_email_address
"quentin@example.com" # Replace with your a way to find your current_email. e.g current_user.email
end
end
-World {|world| world.extend EmailHelpers }
+World(EmailHelpers)
# Use this step to reset the e-mail queue within a scenario.
# This is done automatically before each scenario.
View
4 examples/rails_root/features/support/env.rb
@@ -18,6 +18,4 @@
require 'email_spec/cucumber'
require File.expand_path(File.dirname(__FILE__) +'/../../spec/model_factory.rb')
-World { |world| world.extend(Fixjour) }
-
-
+World(Fixjour)
View
2 ...rails_root/vendor/plugins/email_spec/rails_generators/email_spec/templates/email_steps.rb
@@ -18,7 +18,7 @@ def current_email_address
"quentin@example.com" # Replace with your a way to find your current_email. e.g current_user.email
end
end
-World {|world| world.extend EmailHelpers }
+World(EmailHelpers)
# Use this step to reset the e-mail queue within a scenario.
# This is done automatically before each scenario.
View
6 lib/email_spec/cucumber.rb
@@ -15,7 +15,5 @@
EmailSpec::EmailViewer.save_and_open_all_text_emails if ENV['SHOW_TEXT_EMAILS']
end
-World do |world|
- world.extend EmailSpec::Helpers
- world.extend EmailSpec::Matchers
-end
+World(EmailSpec::Helpers)
+World(EmailSpec::Matchers)
View
2 rails_generators/email_spec/templates/email_steps.rb
@@ -18,7 +18,7 @@ def current_email_address
"quentin@example.com" # Replace with your a way to find your current_email. e.g current_user.email
end
end
-World {|world| world.extend EmailHelpers }
+World(EmailHelpers)
# Use this step to reset the e-mail queue within a scenario.
# This is done automatically before each scenario.

0 comments on commit 7b53336

Please sign in to comment.