rspec-rails 2.11.4 → 2.12.0

data/features/controller_specs/bypass_rescue.feature

@@ -9,7 +9,7 @@ Feature: bypass rescue
 
   Background:
     Given a file named "spec/controllers/gadgets_controller_spec_context.rb" with:
-      """
+      """ruby
       class AccessDenied < StandardError; end
 
       class ApplicationController < ActionController::Base
@@ -25,7 +25,7 @@ Feature: bypass rescue
 
   Scenario: standard exception handling using `rescue_from`
     Given a file named "spec/controllers/gadgets_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       require 'controllers/gadgets_controller_spec_context'
@@ -40,7 +40,7 @@ Feature: bypass rescue
         describe "index" do
           it "redirects to the /401.html page" do
             get :index
-            response.should redirect_to("/401.html")
+            expect(response).to redirect_to("/401.html")
           end
         end
       end
@@ -50,7 +50,7 @@ Feature: bypass rescue
 
   Scenario: bypass `rescue_from` handling with `bypass_rescue`
     Given a file named "spec/controllers/gadgets_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       require 'controllers/gadgets_controller_spec_context'

data/features/controller_specs/controller_spec.feature

@@ -2,14 +2,14 @@ Feature: controller spec
 
   Scenario: simple passing example
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe WidgetsController do
         describe "GET index" do
           it "has a 200 status code" do
             get :index
-            response.code.should eq("200")
+            expect(response.code).to eq("200")
           end
         end
       end
@@ -19,10 +19,10 @@ Feature: controller spec
 
   Scenario: controller is exposed to global before hooks
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
-      RSpec.configure {|c| c.before { controller.should_not be_nil }}
+      RSpec.configure {|c| c.before { expect(controller).not_to be_nil }}
 
       describe WidgetsController do
         describe "GET index" do

data/features/controller_specs/isolation_from_views.feature

@@ -9,20 +9,20 @@ Feature: views are stubbed by default
 
   Scenario: expect template that is rendered by controller action (passes)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe WidgetsController do
         describe "index" do
           it "renders the index template" do
             get :index
-            response.should render_template("index")
-            response.body.should eq ""
+            expect(response).to render_template("index")
+            expect(response.body).to eq ""
           end
           it "renders the widgets/index template" do
             get :index
-            response.should render_template("widgets/index")
-            response.body.should eq ""
+            expect(response).to render_template("widgets/index")
+            expect(response.body).to eq ""
           end
         end
       end
@@ -32,14 +32,14 @@ Feature: views are stubbed by default
 
   Scenario: expect template that is not rendered by controller action (fails)
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe WidgetsController do
         describe "index" do
           it "renders the 'new' template" do
             get :index
-            response.should render_template("new")
+            expect(response).to render_template("new")
           end
         end
       end
@@ -49,7 +49,7 @@ Feature: views are stubbed by default
 
   Scenario: expect empty templates to render when view path is changed at runtime (passes)
     Given a file named "spec/controllers/things_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe ThingsController do
@@ -58,8 +58,8 @@ Feature: views are stubbed by default
             controller.prepend_view_path 'app/views'
             controller.append_view_path 'app/views'
             get :custom_action
-            response.should render_template("custom_action")
-            response.body.should eq ""
+            expect(response).to render_template("custom_action")
+            expect(response.body).to eq ""
           end
         end
       end
@@ -69,7 +69,7 @@ Feature: views are stubbed by default
 
   Scenario: expect template to render the real template with render_views when view path is changed at runtime
     Given a file named "spec/controllers/things_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe ThingsController do
@@ -78,8 +78,8 @@ Feature: views are stubbed by default
         it "renders the real custom_action template" do
           controller.prepend_view_path 'app/views'
           get :custom_action
-          response.should render_template("custom_action")
-          response.body.should match(/template for a custom action/)
+          expect(response).to render_template("custom_action")
+          expect(response.body).to match(/template for a custom action/)
         end
       end
       """

data/features/controller_specs/render_views.feature

@@ -5,7 +5,7 @@ Feature: render_views
 
   Scenario: render_views directly in a single group
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe WidgetsController do
@@ -14,7 +14,7 @@ Feature: render_views
         describe "GET index" do
           it "says 'Listing widgets'" do
             get :index
-            response.body.should =~ /Listing widgets/m
+            expect(response.body).to match /Listing widgets/m
           end
         end
       end
@@ -24,7 +24,7 @@ Feature: render_views
 
   Scenario: render_views on and off in nested groups
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe WidgetsController do
@@ -34,7 +34,7 @@ Feature: render_views
           describe "GET index" do
             it "renders the actual template" do
               get :index
-              response.body.should =~ /Listing widgets/m
+              expect(response.body).to match /Listing widgets/m
             end
           end
 
@@ -44,7 +44,7 @@ Feature: render_views
             describe "GET index" do
               it "renders the RSpec generated template" do
                 get :index
-                response.body.should eq("")
+                expect(response.body).to eq("")
               end
             end
           end
@@ -54,7 +54,7 @@ Feature: render_views
           describe "GET index" do
             it "renders the RSpec generated template" do
               get :index
-              response.body.should eq("")
+              expect(response.body).to eq("")
             end
           end
         end
@@ -65,7 +65,7 @@ Feature: render_views
           describe "GET index" do
             it "renders the actual template" do
               get :index
-              response.body.should =~ /Listing widgets/m
+              expect(response.body).to match /Listing widgets/m
             end
           end
         end
@@ -73,7 +73,7 @@ Feature: render_views
       """
     When I run `rspec spec --order default --format documentation`
     Then the output should contain:
-      """
+      """ruby
       WidgetsController
         with render_views
           GET index
@@ -91,20 +91,20 @@ Feature: render_views
 
   Scenario: render_views globally
     Given a file named "spec/support/render_views.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.render_views
       end
       """
     And a file named "spec/controllers/widgets_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe WidgetsController do
         describe "GET index" do
           it "renders the index template" do
             get :index
-            response.body.should =~ /Listing widgets/m
+            expect(response.body).to match /Listing widgets/m
           end
         end
       end

data/features/feature_specs/feature_spec.feature

@@ -0,0 +1,34 @@
+Feature: feature spec
+
+  Feature specs are high-level tests meant to exercise slices of functionality
+  through an application. They should drive the application only via its
+  external interface, usually web pages.
+
+  Feature specs require the [capybara](http://github.com/jnicklas/capybara)
+  gem, version 2.0.0 or later. Refer to the [capybara API
+  documentation](http://rubydoc.info/github/jnicklas/capybara/master) for more
+  information on the methods and matchers that can be used in feature specs.
+
+  The `feature` and `scenario` DSL correspond to `describe` and `it`,
+  respectively. These methods are simply aliases that allow feature specs to
+  read more as [customer tests](http://c2.com/cgi/wiki?CustomerTest) and
+  [acceptance tests](http://c2.com/cgi/wiki?AcceptanceTest).
+
+  Scenario: specify creating a Widget by driving the application with capybara
+    Given a file named "spec/features/widget_management_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      feature "Widget management" do
+        scenario "User creates a new widget" do
+          visit "/widgets/new"
+
+          fill_in "Name", :with => "My Widget"
+          click_button "Create Widget"
+
+          expect(page).to have_text("Widget was successfully created.")
+        end
+      end
+      """
+    When I run `rspec spec/features/widget_management_spec.rb`
+    Then the example should pass

data/features/helper_specs/helper_spec.feature

@@ -15,19 +15,19 @@ Feature: helper spec
 
   Scenario: helper method that returns a value
     Given a file named "spec/helpers/application_helper_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe ApplicationHelper do
         describe "#page_title" do
           it "returns the default title" do
-            helper.page_title.should eq("RSpec is your friend")
+            expect(helper.page_title).to eq("RSpec is your friend")
           end
         end
       end
       """
     And a file named "app/helpers/application_helper.rb" with:
-      """
+      """ruby
       module ApplicationHelper
         def page_title
           "RSpec is your friend"
@@ -39,20 +39,20 @@ Feature: helper spec
 
   Scenario: helper method that accesses an instance variable
     Given a file named "spec/helpers/application_helper_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe ApplicationHelper do
         describe "#page_title" do
           it "returns the instance variable" do
             assign(:title, "My Title")
-            helper.page_title.should eql("My Title")
+            expect(helper.page_title).to eql("My Title")
           end
         end
       end
       """
     And a file named "app/helpers/application_helper.rb" with:
-      """
+      """ruby
       module ApplicationHelper
         def page_title
           @title || nil
@@ -64,20 +64,20 @@ Feature: helper spec
 
   Scenario: application helper is included in helper object
     Given a file named "spec/helpers/widgets_helper_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe WidgetsHelper do
         describe "#widget_title" do
           it "includes the app name" do
             assign(:title, "This Widget")
-            helper.widget_title.should eq("The App: This Widget")
+            expect(helper.widget_title).to eq("The App: This Widget")
           end
         end
       end
       """
     And a file named "app/helpers/application_helper.rb" with:
-      """
+      """ruby
       module ApplicationHelper
         def app_name
           "The App"
@@ -85,7 +85,7 @@ Feature: helper spec
       end
       """
     And a file named "app/helpers/widgets_helper.rb" with:
-      """
+      """ruby
       module WidgetsHelper
         def widget_title
           "#{app_name}: #{@title}"

data/features/mailer_specs/url_helpers.feature

@@ -2,16 +2,16 @@ Feature: URL helpers in mailer examples
 
   Scenario: using URL helpers with default options
     Given a file named "config/initializers/mailer_defaults.rb" with:
-      """
+      """ruby
       Rails.configuration.action_mailer.default_url_options = { :host => 'example.com' }
       """
     And a file named "spec/mailers/notifications_spec.rb" with:
-      """
+      """ruby
       require 'spec_helper'
 
       describe Notifications do
         it 'should have access to URL helpers' do
-          lambda { gadgets_url }.should_not raise_error
+          expect { gadgets_url }.not_to raise_error
         end
       end
       """
@@ -20,17 +20,17 @@ Feature: URL helpers in mailer examples
 
   Scenario: using URL helpers without default options
     Given a file named "config/initializers/mailer_defaults.rb" with:
-      """
+      """ruby
       # no default options
       """
     And a file named "spec/mailers/notifications_spec.rb" with:
-      """
+      """ruby
       require 'spec_helper'
 
       describe Notifications do
         it 'should have access to URL helpers' do
-          lambda { gadgets_url :host => 'example.com' }.should_not raise_error
-          lambda { gadgets_url }.should raise_error
+          expect { gadgets_url :host => 'example.com' }.not_to raise_error
+          expect { gadgets_url }.to raise_error
         end
       end
       """

data/features/matchers/new_record_matcher.feature

@@ -8,19 +8,32 @@ Feature: be_a_new matcher
 
   Scenario: example spec with four be_a_new possibilities 
     Given a file named "spec/models/widget_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe Widget do
         context "when initialized" do
-          subject { Widget.new }
-          it { should be_a_new(Widget) }
-          it { should_not be_a_new(String) }
+          subject(:widget) { Widget.new }
+
+          it "is a new widget" do
+            expect(widget).to be_a_new(Widget)
+          end
+
+          it "is not a new string" do
+            expect(widget).not_to be_a_new(String)
+          end
         end
+
         context "when saved" do
-          subject { Widget.create }
-          it { should_not be_a_new(Widget) }
-          it { should_not be_a_new(String) }
+          subject(:widget) { Widget.create }
+
+          it "is not a new widget" do
+            expect(widget).not_to be_a_new(Widget)
+          end
+
+          it "is not a new string" do
+            expect(widget).not_to be_a_new(String)
+          end
         end
       end
       """

data/features/matchers/redirect_to_matcher.feature

@@ -9,7 +9,7 @@ Feature: redirect_to matcher
 
   Scenario: redirect_to with four possible options
     Given a file named "spec/controllers/widgets_controller_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe WidgetsController do
@@ -18,20 +18,20 @@ Feature: redirect_to matcher
           subject { post :create, :widget => { :name => "Foo" } }
 
           it "redirects to widget_url(@widget)" do
-            subject.should redirect_to(widget_url(assigns(:widget)))
+            expect(subject).to redirect_to(widget_url(assigns(:widget)))
           end
 
           it "redirects_to :action => :show" do
-            subject.should redirect_to :action => :show,
-                                       :id => assigns(:widget).id
+            expect(subject).to redirect_to :action => :show,
+                                           :id => assigns(:widget).id
           end
 
           it "redirects_to(@widget)" do
-            subject.should redirect_to(assigns(:widget))
+            expect(subject).to redirect_to(assigns(:widget))
           end
 
           it "redirects_to /widgets/:id" do
-            subject.should redirect_to("/widgets/#{assigns(:widget).id}")
+            expect(subject).to redirect_to("/widgets/#{assigns(:widget).id}")
           end
         end
       end