upgrade cucumber and aruba

rspec · Mar 25, 2011 · 2a0c0d7 · 2a0c0d7
1 parent ca78581
commit 2a0c0d7
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 71 deletions.
diff --git a/Gemfile-base b/Gemfile-base
@@ -10,9 +10,8 @@ source "http://rubygems.org"
 end
 
 gem 'sqlite3-ruby', :require => 'sqlite3'
-gem "rake", "0.8.7"
+gem "cucumber", "~> 0.10.2"
-gem "cucumber", "0.10.0"
+gem "aruba", "~> 0.3.5"
-gem "aruba", "0.2.2"
 gem "rcov", "0.9.9"
 gem "relish", "0.2.0"
 gem "guard-rspec", "0.1.9"

diff --git a/features/controller_specs/anonymous_controller.feature b/features/controller_specs/anonymous_controller.feature
@@ -36,7 +36,7 @@ Feature: anonymous controller
       end
     end
     """
-    When I run "rspec spec"
+    When I run `rspec spec`
     Then the examples should all pass
 
   Scenario: specify error handling in subclass of ApplicationController
@@ -74,5 +74,5 @@ Feature: anonymous controller
       end
     end
     """
-    When I run "rspec spec"
+    When I run `rspec spec`
     Then the examples should all pass
diff --git a/features/controller_specs/controller_spec.feature b/features/controller_specs/controller_spec.feature
@@ -15,5 +15,5 @@ Feature: controller spec
         end
       end
       """
-    When I run "rspec spec"
+    When I run `rspec spec`
     Then the example should pass
diff --git a/features/controller_specs/isolation_from_views.feature b/features/controller_specs/isolation_from_views.feature
@@ -27,7 +27,7 @@ Feature: views are stubbed by default
         end
       end
       """
-    When I run "rspec ./spec"
+    When I run `rspec spec`
     Then the examples should all pass
 
   Scenario: expect template that is not rendered by controller action (fails)
@@ -44,6 +44,6 @@ Feature: views are stubbed by default
         end
       end
       """
-    When I run "rspec ./spec"
+    When I run `rspec spec`
     Then the output should contain "1 example, 1 failure"
 
diff --git a/features/controller_specs/render_views.feature b/features/controller_specs/render_views.feature
@@ -19,7 +19,7 @@ Feature: render_views
         end
       end
       """
-    When I run "rspec spec"
+    When I run `rspec spec`
     Then the examples should all pass
 
   Scenario: render_views on and off in nested groups
@@ -71,7 +71,7 @@ Feature: render_views
         end
       end
       """
-    When I run "rspec spec --format documentation"
+    When I run `rspec spec --format documentation`
     Then the output should contain:
       """
       WidgetsController
@@ -109,6 +109,6 @@ Feature: render_views
         end
       end
       """
-    When I run "rspec spec"
+    When I run `rspec spec`
     Then the examples should all pass
 
diff --git a/features/helper_specs/helper_spec.feature b/features/helper_specs/helper_spec.feature
@@ -25,7 +25,7 @@ Feature: helper spec
         end
       end
       """
-    When I run "rspec spec/helpers/application_helper_spec.rb"
+    When I run `rspec spec/helpers/application_helper_spec.rb`
     Then the examples should all pass
 
   Scenario: helper method that accesses an instance variable
@@ -50,7 +50,7 @@ Feature: helper spec
         end
       end
       """
-    When I run "rspec spec/helpers/application_helper_spec.rb"
+    When I run `rspec spec/helpers/application_helper_spec.rb`
     Then the examples should all pass
 
   Scenario: application helper is included in helper object
@@ -83,5 +83,5 @@ Feature: helper spec
         end
       end
       """
-    When I run "rspec spec/helpers/widgets_helper_spec.rb"
+    When I run `rspec spec/helpers/widgets_helper_spec.rb`
     Then the examples should all pass
diff --git a/features/mailer_specs/url_helpers.feature b/features/mailer_specs/url_helpers.feature
@@ -15,7 +15,7 @@ Feature: URL helpers in mailer examples
         end
       end
       """
-    When I run "rspec spec"
+    When I run `rspec spec`
     Then the examples should all pass
 
   Scenario: using URL helpers without default options
@@ -34,5 +34,5 @@ Feature: URL helpers in mailer examples
         end
       end
       """
-    When I run "rspec spec"
+    When I run `rspec spec`
     Then the examples should all pass
diff --git a/features/matchers/new_record_matcher.feature b/features/matchers/new_record_matcher.feature
@@ -24,7 +24,7 @@ Feature: be_a_new matcher
         end
       end
       """
-    When I run "rspec spec/models/widget_spec.rb"
+    When I run `rspec spec/models/widget_spec.rb`
     Then the examples should all pass
 
   Scenario: example spec using be_a_new.with
@@ -66,5 +66,5 @@ Feature: be_a_new matcher
         end
       end
       """
-    When I run "rspec spec/models/widget_spec.rb"
+    When I run `rspec spec/models/widget_spec.rb`
     Then the examples should all pass
diff --git a/features/matchers/redirect_to_matcher.feature b/features/matchers/redirect_to_matcher.feature
@@ -36,5 +36,5 @@ Feature: redirect_to matcher
         end
       end
       """
-    When I run "rspec spec/controllers/widgets_controller_spec.rb"
+    When I run `rspec spec/controllers/widgets_controller_spec.rb`
     Then the examples should all pass
diff --git a/features/matchers/render_template_matcher.feature b/features/matchers/render_template_matcher.feature
@@ -21,5 +21,5 @@ Feature: render_template matcher
         end
       end
       """
-    When I run "rspec spec/controllers/gadgets_spec.rb"
+    When I run `rspec spec/controllers/gadgets_spec.rb`
     Then the examples should all pass
diff --git a/features/mocks/mock_model.feature b/features/mocks/mock_model.feature
@@ -36,7 +36,7 @@ Feature: mock_model
         end
       end
       """
-    When I run "rspec spec/models/car_spec.rb"
+    When I run `rspec spec/models/car_spec.rb`
     Then the examples should all pass
 
   Scenario: passing a string that represents an existing constant
@@ -51,7 +51,7 @@ Feature: mock_model
         end
       end
       """
-    When I run "rspec spec/models/widget_spec.rb"
+    When I run `rspec spec/models/widget_spec.rb`
     Then the examples should all pass
 
   Scenario: passing a class that does not extend ActiveModel::Naming
@@ -65,7 +65,7 @@ Feature: mock_model
         end
       end
       """
-    When I run "rspec spec/models/string_spec.rb"
+    When I run `rspec spec/models/string_spec.rb`
     Then the examples should all pass
 
   Scenario: passing an Active Record constant
@@ -94,7 +94,7 @@ Feature: mock_model
         end
       end
       """
-    When I run "rspec spec/models/widget_spec.rb"
+    When I run `rspec spec/models/widget_spec.rb`
     Then the examples should all pass
 
   Scenario: passing an Active Record constant with method stubs
@@ -127,5 +127,5 @@ Feature: mock_model
         end
       end
       """
-    When I run "rspec spec/models/widget_spec.rb"
+    When I run `rspec spec/models/widget_spec.rb`
     Then the examples should all pass
diff --git a/features/mocks/stub_model.feature b/features/mocks/stub_model.feature
@@ -34,7 +34,7 @@ Feature: stub_model
         end
       end
       """
-    When I run "rspec spec/models/widget_spec.rb"
+    When I run `rspec spec/models/widget_spec.rb`
     Then the examples should all pass
 
   Scenario: passing an Active Record constant with a block of stubs
@@ -54,5 +54,5 @@ Feature: stub_model
         end
       end
       """
-    When I run "rspec spec/models/widget_spec.rb"
+    When I run `rspec spec/models/widget_spec.rb`
     Then the examples should all pass
diff --git a/features/model_specs/errors_on.feature b/features/model_specs/errors_on.feature
@@ -28,5 +28,5 @@ Feature: errors_on
         end
       end
       """
-    When I run "rspec spec/models/widget_spec.rb"
+    When I run `rspec spec/models/widget_spec.rb`
     Then the examples should all pass
diff --git a/features/model_specs/transactional_examples.feature b/features/model_specs/transactional_examples.feature
@@ -20,7 +20,7 @@ Feature: transactional examples
         end
       end
       """
-    When I run "rspec spec/models/widget_spec.rb"
+    When I run `rspec spec/models/widget_spec.rb`
     Then the examples should all pass
 
   Scenario: run in transactions (explicit)
@@ -47,7 +47,7 @@ Feature: transactional examples
         end
       end
       """
-    When I run "rspec spec/models/widget_spec.rb"
+    When I run `rspec spec/models/widget_spec.rb`
     Then the examples should all pass
 
   Scenario: disable transactions (explicit)
@@ -76,7 +76,7 @@ Feature: transactional examples
         after(:all) { Widget.destroy_all }
       end
       """
-    When I run "rspec spec/models/widget_spec.rb"
+    When I run `rspec spec/models/widget_spec.rb`
     Then the examples should all pass
 
   Scenario: run in transactions with fixture
@@ -96,7 +96,7 @@ Feature: transactional examples
       one:
         name: MyString
       """
-    When I run "rspec spec/models/thing_spec.rb"
+    When I run `rspec spec/models/thing_spec.rb`
     Then the examples should all pass
 
 

diff --git a/features/routing_specs/be_routable_matcher.feature b/features/routing_specs/be_routable_matcher.feature
@@ -16,7 +16,7 @@ Feature: be_routable matcher
       end
       """
 
-    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    When I run `rspec spec/routing/widgets_routing_spec.rb`
     Then the output should contain "1 example, 1 failure"
 
   Scenario: specify non-routeable route should not be routable (passes)
@@ -31,7 +31,7 @@ Feature: be_routable matcher
       end
       """
 
-    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    When I run `rspec spec/routing/widgets_routing_spec.rb`
     Then the examples should all pass
 
   Scenario: specify routeable route should be routable (passes)
@@ -46,7 +46,7 @@ Feature: be_routable matcher
       end
       """
 
-    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    When I run `rspec spec/routing/widgets_routing_spec.rb`
     Then the examples should all pass
 
   Scenario: specify non-routeable route should be routable (fails)
@@ -61,7 +61,7 @@ Feature: be_routable matcher
       end
       """
 
-    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    When I run `rspec spec/routing/widgets_routing_spec.rb`
     Then the output should contain "1 example, 1 failure"
 
   Scenario: be_routable in a controller spec
@@ -76,5 +76,5 @@ Feature: be_routable matcher
       end
       """
 
-    When I run "rspec spec/controllers/widgets_controller_spec.rb"
+    When I run `rspec spec/controllers/widgets_controller_spec.rb`
     Then the examples should all pass
diff --git a/features/routing_specs/named_routes.feature b/features/routing_specs/named_routes.feature
@@ -14,5 +14,5 @@ Feature: named routes
         end
       end
       """
-    When I run "rspec spec"
+    When I run `rspec spec`
     Then the examples should all pass
diff --git a/features/routing_specs/route_to_matcher.feature b/features/routing_specs/route_to_matcher.feature
@@ -23,7 +23,7 @@ Feature: route_to matcher
       end
       """
 
-    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    When I run `rspec spec/routing/widgets_routing_spec.rb`
     Then the examples should all pass
 
   Scenario: passing route spec with verbose syntax
@@ -39,7 +39,7 @@ Feature: route_to matcher
       end
       """
 
-    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    When I run `rspec spec/routing/widgets_routing_spec.rb`
     Then the examples should all pass
 
   Scenario: route spec for a route that doesn't exist (fails)
@@ -54,5 +54,5 @@ Feature: route_to matcher
       end
       """
 
-    When I run "rspec spec/routing/widgets_routing_spec.rb"
+    When I run `rspec spec/routing/widgets_routing_spec.rb`
     Then the output should contain "1 failure"
diff --git a/features/step_definitions/additional_cli_steps.rb b/features/step_definitions/additional_cli_steps.rb
@@ -1,4 +1,4 @@
 Then /^the example(s)? should( all)? pass$/ do |_, _|
-  Then %q{the exit status should be 0}
   Then %q{the output should contain "0 failures"}
+  Then %q{the exit status should be 0}
 end
diff --git a/features/support/env.rb b/features/support/env.rb
@@ -1,19 +1,8 @@
-require 'aruba'
+require 'aruba/cucumber'
 require 'webrat'
 
-module Aruba::Api
-  alias_method :orig_run, :run
-
-  def run(cmd, fail_on_error=false)
-    if cmd =~ /^rspec/
-      orig_run("bundle exec #{cmd}", fail_on_error)
-    else
-      orig_run(cmd, fail_on_error)
-    end
-  end
-end
-
 Before do
+  @aruba_timeout_seconds = 10
   unset_bundler_env_vars
 end
 
@@ -41,7 +30,6 @@ def copy(file_or_dir)
   system "cp -r #{source} #{target}"
 end
 
-
 Before do
   steps %Q{
     Given a directory named "spec"
@@ -56,10 +44,8 @@ def copy(file_or_dir)
   ["spec/spec_helper.rb"].each do |file_or_dir|
     write_symlink("tmp/example_app/#{file_or_dir}")
   end
-
 end
 
 Around do |scenario, block|
   Bundler.with_clean_env &block
 end
-
diff --git a/features/view_specs/inferred_controller_path.feature b/features/view_specs/inferred_controller_path.feature
@@ -11,7 +11,7 @@ Feature: view spec infers controller path and action
         end
       end
       """
-    When I run "rspec spec/views"
+    When I run `rspec spec/views`
     Then the examples should all pass
 
   Scenario: infer action
@@ -25,7 +25,7 @@ Feature: view spec infers controller path and action
         end
       end
       """
-    When I run "rspec spec/views"
+    When I run `rspec spec/views`
     Then the examples should all pass
 
   Scenario: do not infer action in a partial
@@ -39,6 +39,6 @@ Feature: view spec infers controller path and action
         end
       end
       """
-    When I run "rspec spec/views"
+    When I run `rspec spec/views`
     Then the examples should all pass