rspec-rails 2.5.0 → 2.6.0

data/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

data/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

data/features/matchers/new_record_matcher.feature

@@ -24,47 +24,5 @@ Feature: be_a_new matcher
         end
       end
       """
-    When I run "rspec spec/models/widget_spec.rb"
-    Then the examples should all pass
-
-  Scenario: example spec using be_a_new.with
-    Given a file named "spec/models/widget_spec.rb" with:
-      """
-      require "spec_helper"
-
-      class Widget < ActiveRecord::Base
-        establish_connection :adapter => 'sqlite3',
-                             :database => ':memory:'
-
-        connection.execute <<-eosql
-          CREATE TABLE widgets (
-            foo_id integer,
-            number integer
-          )
-        eosql
-      end
-
-      describe Widget do
-        context "when initialized with attributes" do
-          subject { Widget.new(:foo_id => 1, :number => 1) }
-
-          it "has all of the attributes" do
-            should be_a_new(Widget).with(:foo_id => 1, :number => 1)
-          end
-
-          it "has one of the attributes" do
-            should be_a_new(Widget).with(:foo_id => 1)
-          end
-
-          it "has none of the attributes" do
-            should_not be_a_new(Widget).with(:blah => 'blah')
-          end
-
-          it "has one of the attribute values not the same" do
-            should_not be_a_new(Widget).with(:foo_id => 2)
-          end
-        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

data/features/matchers/redirect_to_matcher.feature

@@ -1,7 +1,7 @@
 Feature: redirect_to matcher
 
-  The `redirect_to` matcher is used to specify that the redirect called in the
-  latest action ended with the intended behaviour. Essentially, it delegates to
+  The `redirect_to` matcher is used to specify that a request redirects to a
+  given template or action.  It delegates to
   [`assert_redirected_to`](http://api.rubyonrails.org/classes/ActionDispatch/Assertions/ResponseAssertions.html#method-i-assert_redirected_to).
 
   It is available in controller specs (spec/controllers) and request
@@ -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

data/features/matchers/render_template_matcher.feature

@@ -1,10 +1,13 @@
 Feature: render_template matcher
 
-  This matcher just delegates to the Rails assertion method
-  "assert_template". For complete info on the available options,
-  please take a look at the Rails documentation.
+  The `render_template` matcher is used to specify that a request renders a
+  given template.  It delegates to
+  [`assert_template`](http://api.rubyonrails.org/classes/ActionController/TemplateAssertions.html#method-i-assert_template)
 
-  This method is available in spec/controllers and spec/requests.
+  It is available in controller specs (spec/controllers) and request
+  specs (spec/requests).
+
+  NOTE: use `redirect_to(:action => 'new')` for redirects, not `render_template`.
 
   Scenario: render_template with three possible options
     Given a file named "spec/controllers/gadgets_spec.rb" with:
@@ -12,14 +15,14 @@ Feature: render_template matcher
       require "spec_helper"
 
       describe GadgetsController do
-        describe "#index" do
+        describe "GET #index" do
           subject { get :index }
 
-          specify { should render_template(:index) }
-          specify { should render_template("index") }
-          specify { should render_template("gadgets/index") }
+          it { should render_template(:index) }
+          it { should render_template("index") }
+          it { should render_template("gadgets/index") }
         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

data/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,21 @@ 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: mock_model outside rails
+    Given a file named "mock_model_outside_rails_spec.rb" with:
+      """
+      require 'rspec/rails/mocks'
+
+      describe "Foo" do
+        it "is mockable" do
+          foo = mock_model("Foo")
+          foo.id.should eq(1001)
+          foo.to_param.should eq("1001")
+        end
+      end
+      """
+    When I run `rspec mock_model_outside_rails_spec.rb`
     Then the examples should all pass

data/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

data/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

data/features/model_specs/transactional_examples.feature

@@ -1,5 +1,10 @@
 Feature: transactional examples
 
+  By default rspec executes each individual example in a transaction.
+
+  You can also explicitly enable/disable transactions the configuration
+  property 'use_transactional_examples'.
+
   Scenario: run in transactions (default)
     Given a file named "spec/models/widget_spec.rb" with:
       """
@@ -20,7 +25,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 +52,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 +81,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
@@ -84,7 +89,7 @@ Feature: transactional examples
       """
       require "spec_helper"
 
-      describe Thing do 
+      describe Thing do
         fixtures :things
         it "fixture method defined" do
           things(:one)
@@ -96,7 +101,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
 
 

data/features/request_specs/request_spec.feature

@@ -0,0 +1,49 @@
+Feature: request spec
+
+  Request specs provide a thin wrapper around Rails' integration tests, and are
+  designed to drive behavior through the full stack, including routing
+  (provided by Rails) and without stubbing (that's up to you).
+
+  With request specs, you can:
+
+  * specify a single request
+  * specify multiple requests across multiple controllers
+  * specify multiple requests across multiple sessions
+
+  Check the rails documentation on integration tests for more information.
+
+  RSpec provides two matchers that delegate to Rails assertions:
+
+      render_template # delegates to assert_template
+      redirect_to     # delegates to assert_redirected_to
+
+  Check the Rails docs for details on these methods as well.
+
+  If you would like to use webrat or capybara with your request specs, all you
+  have to do is include one of them in your Gemfile and RSpec will
+  automatically load them in a request spec.
+
+  Scenario: specify managing a Widget with Rails integration methods
+    Given a file named "spec/requests/widget_management_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "Widget management" do
+
+        it "creates a Widget and redirects to the Widget's page" do
+          get "/widgets/new"
+          response.should render_template(:new)
+
+          post "/widgets", :widget => {:name => "My Widget"}
+
+          response.should redirect_to(assigns(:widget))
+          follow_redirect!
+
+          response.should render_template(:show)
+          response.body.should include("Widget was successfully created.")
+        end
+
+      end
+      """
+    When I run `rspec spec/requests/widget_management_spec.rb`
+    Then the example should pass

data/features/routing_specs/README.md

@@ -1,4 +1,5 @@
-Routing specs live in the `spec/routing` directory. 
+Routing specs live in the `spec/routing` directory, or any example group with
+`:type => :routing`.
 
 Simple apps with nothing but standard RESTful routes won't get much value from
 routing specs, but they can provide significant value when used to specify

data/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

data/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

data/features/routing_specs/route_to_matcher.feature

@@ -1,11 +1,32 @@
 Feature: route_to matcher
 
-  The `route_to` matcher specifies that a request (verb + uri) is routable.  It
-  is most valuable when specifying routes other than standard RESTful routes.
+  The `route_to` matcher specifies that a request (verb + path) is routable.
+  It is most valuable when specifying routes other than standard RESTful
+  routes.
+
+      get("/").should route_to("welcome#index") # new in 2.6.0
+
+      or
 
       { :get => "/" }.should route_to(:controller => "welcome")
 
-  Scenario: passing route spec
+  Scenario: passing route spec with shortcut syntax
+    Given a file named "spec/routing/widgets_routing_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "routes for Widgets" do
+        it "routes /widgets to the widgets controller" do
+          get("/widgets").
+            should route_to("widgets#index")
+        end
+      end
+      """
+
+    When I run `rspec spec/routing/widgets_routing_spec.rb`
+    Then the examples should all pass
+
+  Scenario: passing route spec with verbose syntax
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
       """
       require "spec_helper"
@@ -18,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)
@@ -28,11 +49,10 @@ Feature: route_to matcher
 
       describe "routes for Widgets" do
         it "routes /widgets/foo to the /foo action" do
-          { :get => "/widgets/foo" }.
-            should route_to(:controller => "widgets", :action => "foo")
+          get("/widgets/foo").should route_to("widgets#foo")
         end
       end
       """
 
-    When I run "rspec spec/routing/widgets_routing_spec.rb"
-    Then the output should contain "1 example, 1 failure"
+    When I run `rspec spec/routing/widgets_routing_spec.rb`
+    Then the output should contain "1 failure"

data/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

data/features/support/env.rb

@@ -1,20 +1,15 @@
-require 'aruba'
-require 'webrat'
+require 'aruba/cucumber'
 
-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
+module ArubaExt
+  def run(cmd)
+    super(cmd =~ /^rspec/ ? "bundle exec #{cmd}" : cmd)
   end
 end
 
+World(ArubaExt)
+
 Before do
-  unset_bundler_env_vars
+  @aruba_timeout_seconds = 10
 end
 
 unless File.directory?('./tmp/example_app')
@@ -41,7 +36,6 @@ def copy(file_or_dir)
   system "cp -r #{source} #{target}"
 end
 
-
 Before do
   steps %Q{
     Given a directory named "spec"
@@ -56,10 +50,4 @@ Before do
   ["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
-

data/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
 

data/features/view_specs/stub_template.feature

@@ -26,7 +26,7 @@ Feature: stub template
       """
       <%= render :partial => "gadget", :collection => @gadgets %>
       """
-    When I run "rspec spec/views/gadgets/list.html.erb_spec.rb"
+    When I run `rspec spec/views/gadgets/list.html.erb_spec.rb`
     Then the examples should all pass
 
   Scenario: stub template that exists
@@ -46,6 +46,6 @@ Feature: stub template
         end
       end
       """
-    When I run "rspec spec/views/gadgets/edit.html.erb_spec.rb"
+    When I run `rspec spec/views/gadgets/edit.html.erb_spec.rb`
     Then the examples should all pass