rspec-rails 2.99.0 → 3.0.0.beta1

data/lib/generators/rspec/controller/templates/controller_spec.rb

@@ -7,7 +7,7 @@ describe <%= class_name %>Controller do
   describe "GET '<%= action %>'" do
     it "returns http success" do
       get '<%= action %>'
-      response.should be_success
+      expect(response).to be_success
     end
   end
 

data/lib/generators/rspec/install/templates/spec/spec_helper.rb.tt

@@ -2,6 +2,7 @@
 ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
+require 'rspec/autorun'
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
 # spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
@@ -12,12 +13,7 @@ require 'rspec/rails'
 # option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
 Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
-<% if ::Rails::VERSION::STRING >= '4.1' -%>
-# Checks for pending migrations before tests are run.
-# If you are not using ActiveRecord, you can remove this line.
-ActiveRecord::Migration.maintain_test_schema!
-
-<% elsif ::Rails::VERSION::STRING >= '4' -%>
+<% if ::Rails::VERSION::STRING >= '4' -%>
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
@@ -50,19 +46,4 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = "random"
-
-  # RSpec Rails can automatically mix in different behaviours to your tests
-  # based on their file location, for example enabling you to call `get` and
-  # `post` in specs under `spec/controllers`.
-  #
-  # You can disable this behaviour by removing the line below, and instead
-  # explictly tag your specs with their type, e.g.:
-  #
-  #     describe UsersController, :type => :controller do
-  #       # ...
-  #     end
-  #
-  # The different available types are documented in the features, such as in
-  # https://relishapp.com/rspec/rspec-rails/v/3-0/docs
-  config.infer_spec_type_from_file_location!
 end

data/lib/generators/rspec/integration/integration_generator.rb

@@ -10,16 +10,15 @@ module Rspec
       def generate_request_spec
         return unless options[:request_specs]
 
-        RSpec.deprecate("the --webrat-matchers option", :replacement => nil) if options[:webrat_matchers]
-        RSpec.deprecate("the --webrat option", :replacement => nil) if options[:webrat]
-
         template 'request_spec.rb',
                  File.join('spec/requests', class_path, "#{table_name}_spec.rb")
       end
 
     protected
 
+      # @deprecated Use `--webrat` instead.
       def webrat?
+        RSpec.deprecate("the --webrat-matchers option", :replacement => "--webrat") if options[:webrat_matchers]
         options[:webrat] || options[:webrat_matchers]
       end
 

data/lib/generators/rspec/integration/templates/request_spec.rb

@@ -9,7 +9,7 @@ describe "<%= class_name.pluralize %>" do
       # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
       get <%= index_helper %>_path
 <% end -%>
-      response.status.should be(200)
+      expect(response.status).to be(200)
     end
   end
 end

data/lib/generators/rspec/mailer/templates/mailer_spec.rb

@@ -7,13 +7,13 @@ describe <%= class_name %> do
     let(:mail) { <%= class_name %>.<%= action %> }
 
     it "renders the headers" do
-      mail.subject.should eq(<%= action.to_s.humanize.inspect %>)
-      mail.to.should eq(["to@example.org"])
-      mail.from.should eq(["from@example.com"])
+      expect(mail.subject).to eq(<%= action.to_s.humanize.inspect %>)
+      expect(mail.to).to eq(["to@example.org"])
+      expect(mail.from).to eq(["from@example.com"])
     end
 
     it "renders the body" do
-      mail.body.encoded.should match("Hi")
+      expect(mail.body.encoded).to match("Hi")
     end
   end
 

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -22,9 +22,6 @@ module Rspec
       def generate_controller_spec
         return unless options[:controller_specs]
 
-        RSpec.deprecate("the --webrat-matchers option", :replacement => nil) if options[:webrat_matchers]
-        RSpec.deprecate("the --webrat option", :replacement => nil) if options[:webrat]
-
         template 'controller_spec.rb',
                  File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
       end
@@ -49,7 +46,9 @@ module Rspec
 
       protected
 
+        # @deprecated Use `--webrat` instead.
         def webrat?
+          RSpec.deprecate("--webrat-matchers", :replacement => "--webrat") if options[:webrat_matchers]
           options[:webrat] || options[:webrat_matchers]
         end
 

data/lib/generators/rspec/scaffold/templates/controller_spec.rb

@@ -36,7 +36,7 @@ describe <%= controller_class_name %>Controller do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :index, {}, valid_session
-      assigns(:<%= table_name %>).should eq([<%= file_name %>])
+      expect(assigns(:<%= table_name %>)).to eq([<%= file_name %>])
     end
   end
 
@@ -45,14 +45,14 @@ describe <%= controller_class_name %>Controller do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :show, {:id => <%= file_name %>.to_param}, valid_session
-      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+      expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
     end
   end
 
   describe "GET new" do
     it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
       get :new, {}, valid_session
-      assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
+      expect(assigns(:<%= ns_file_name %>)).to be_a_new(<%= class_name %>)
     end
   end
 
@@ -60,7 +60,7 @@ describe <%= controller_class_name %>Controller do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :edit, {:id => <%= file_name %>.to_param}, valid_session
-      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+      expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
     end
   end
 
@@ -74,13 +74,13 @@ describe <%= controller_class_name %>Controller do
 
       it "assigns a newly created <%= ns_file_name %> as @<%= ns_file_name %>" do
         post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
-        assigns(:<%= ns_file_name %>).should be_a(<%= class_name %>)
-        assigns(:<%= ns_file_name %>).should be_persisted
+        expect(assigns(:<%= ns_file_name %>)).to be_a(<%= class_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to be_persisted
       end
 
       it "redirects to the created <%= ns_file_name %>" do
         post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
-        response.should redirect_to(<%= class_name %>.last)
+        expect(response).to redirect_to(<%= class_name %>.last)
       end
     end
 
@@ -89,14 +89,14 @@ describe <%= controller_class_name %>Controller do
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
         post :create, {:<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
-        assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to be_a_new(<%= class_name %>)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
         post :create, {:<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
-        response.should render_template("new")
+        expect(response).to render_template("new")
       end
     end
   end
@@ -110,9 +110,9 @@ describe <%= controller_class_name %>Controller do
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
         <%- if ::Rails::VERSION::STRING >= '4' -%>
-        <%= class_name %>.any_instance.should_receive(:update).with(<%= formatted_hash(example_params_for_update) %>)
+        expect_any_instance_of(<%= class_name %>).to receive(:update).with(<%= formatted_hash(example_params_for_update) %>)
         <%- else -%>
-        <%= class_name %>.any_instance.should_receive(:update_attributes).with(<%= formatted_hash(example_params_for_update) %>)
+        expect_any_instance_of(<%= class_name %>).to receive(:update_attributes).with(<%= formatted_hash(example_params_for_update) %>)
         <%- end -%>
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_params_for_update) %>}, valid_session
       end
@@ -120,13 +120,13 @@ describe <%= controller_class_name %>Controller do
       it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes}, valid_session
-        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
       end
 
       it "redirects to the <%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes}, valid_session
-        response.should redirect_to(<%= file_name %>)
+        expect(response).to redirect_to(<%= file_name %>)
       end
     end
 
@@ -136,7 +136,7 @@ describe <%= controller_class_name %>Controller do
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
-        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
       end
 
       it "re-renders the 'edit' template" do
@@ -144,7 +144,7 @@ describe <%= controller_class_name %>Controller do
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
-        response.should render_template("edit")
+        expect(response).to render_template("edit")
       end
     end
   end
@@ -160,7 +160,7 @@ describe <%= controller_class_name %>Controller do
     it "redirects to the <%= table_name %> list" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
-      response.should redirect_to(<%= index_helper %>_url)
+      expect(response).to redirect_to(<%= index_helper %>_url)
     end
   end
 

data/lib/generators/rspec/scaffold/templates/edit_spec.rb

@@ -14,9 +14,9 @@ describe "<%= ns_table_name %>/edit" do
     render
 
 <% if webrat? -%>
-    rendered.should have_selector("form", :action => <%= ns_file_name %>_path(@<%= ns_file_name %>), :method => "post") do |form|
+    expect(rendered).to have_selector("form", :action => <%= ns_file_name %>_path(@<%= ns_file_name %>), :method => "post") do |form|
 <% for attribute in output_attributes -%>
-      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
+      expect(form).to have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
 <% end -%>
     end
 <% else -%>

data/lib/generators/rspec/scaffold/templates/index_spec.rb

@@ -23,7 +23,7 @@ describe "<%= ns_table_name %>/index" do
 <% end -%>
 <% for attribute in output_attributes -%>
 <% if webrat? -%>
-    rendered.should have_selector("tr>td", :content => <%= value_for(attribute) %>.to_s, :count => 2)
+    expect(rendered).to have_selector("tr>td", :content => <%= value_for(attribute) %>.to_s, :count => 2)
 <% else -%>
     assert_select "tr>td", :text => <%= value_for(attribute) %>.to_s, :count => 2
 <% end -%>

data/lib/generators/rspec/scaffold/templates/new_spec.rb

@@ -13,9 +13,9 @@ describe "<%= ns_table_name %>/new" do
     render
 
 <% if webrat? -%>
-    rendered.should have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
+    expect(rendered).to have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
 <% for attribute in output_attributes -%>
-      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
+      expect(form).to have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
 <% end -%>
     end
 <% else -%>

data/lib/generators/rspec/scaffold/templates/routing_spec.rb

@@ -6,32 +6,32 @@ describe <%= controller_class_name %>Controller do
 
 <% unless options[:singleton] -%>
     it "routes to #index" do
-      get("/<%= ns_table_name %>").should route_to("<%= ns_table_name %>#index")
+      expect(:get => "/<%= ns_table_name %>").to route_to("<%= ns_table_name %>#index")
     end
 
 <% end -%>
     it "routes to #new" do
-      get("/<%= ns_table_name %>/new").should route_to("<%= ns_table_name %>#new")
+      expect(:get => "/<%= ns_table_name %>/new").to route_to("<%= ns_table_name %>#new")
     end
 
     it "routes to #show" do
-      get("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#show", :id => "1")
+      expect(:get => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#show", :id => "1")
     end
 
     it "routes to #edit" do
-      get("/<%= ns_table_name %>/1/edit").should route_to("<%= ns_table_name %>#edit", :id => "1")
+      expect(:get => "/<%= ns_table_name %>/1/edit").to route_to("<%= ns_table_name %>#edit", :id => "1")
     end
 
     it "routes to #create" do
-      post("/<%= ns_table_name %>").should route_to("<%= ns_table_name %>#create")
+      expect(:post => "/<%= ns_table_name %>").to route_to("<%= ns_table_name %>#create")
     end
 
     it "routes to #update" do
-      put("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#update", :id => "1")
+      expect(:put => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#update", :id => "1")
     end
 
     it "routes to #destroy" do
-      delete("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#destroy", :id => "1")
+      expect(:delete => "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#destroy", :id => "1")
     end
 
   end

data/lib/generators/rspec/scaffold/templates/show_spec.rb

@@ -19,9 +19,9 @@ describe "<%= ns_table_name %>/show" do
 <% end -%>
 <% for attribute in output_attributes -%>
 <% if webrat? -%>
-    rendered.should contain(<%= value_for(attribute) %>.to_s)
+    expect(rendered).to contain(<%= value_for(attribute) %>.to_s)
 <% else -%>
-    rendered.should match(/<%= eval(value_for(attribute)) %>/)
+    expect(rendered).to match(/<%= eval(value_for(attribute)) %>/)
 <% end -%>
 <% end -%>
   end

data/lib/rspec/rails.rb

@@ -11,12 +11,7 @@ require 'rspec/rails/view_rendering'
 require 'rspec/rails/adapters'
 require 'rspec/rails/matchers'
 require 'rspec/rails/fixture_support'
-
-# Load rspec-activemodel-mocks if available; otherwise fall back
-# to the deprecated mock methods
 require 'rspec/rails/mocks'
-require 'rspec/rails/module_inclusion'
 require 'rspec/rails/example'
-require 'rspec/rails/infer_type_configuration'
 require 'rspec/rails/vendor/capybara'
 require 'rspec/rails/vendor/webrat'

data/lib/rspec/rails/adapters.rb

@@ -1,5 +1,4 @@
 require 'delegate'
-require 'active_support'
 require 'active_support/concern'
 
 module RSpec
@@ -9,13 +8,7 @@ module RSpec
       require 'minitest/assertions'
       Assertions = Minitest::Assertions
     else
-      begin
-        require 'test/unit/assertions'
-      rescue LoadError
-        # work around for Rubinius not having a std std-lib
-        require 'rubysl-test-unit' if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-        require 'test/unit/assertions'
-      end
+      require 'test/unit/assertions'
       Assertions = Test::Unit::Assertions
     end
 
@@ -108,10 +101,10 @@ module RSpec
         # hooks.
         def setup(*methods)
           methods.each do |method|
-            if method.to_s =~ /^setup_(with_controller|fixtures|controller_request_and_response)$/
-              prepend_before { __send__ method }
+            if method.to_s =~ /^setup_(fixtures|controller_request_and_response)$/
+              prepend_before { send method }
             else
-              before         { __send__ method }
+              before         { send method }
             end
           end
         end
@@ -121,7 +114,7 @@ module RSpec
         # Wraps `teardown` calls from within Rails' testing framework in
         # `after` hooks.
         def teardown(*methods)
-          methods.each { |method| after { __send__ method } }
+          methods.each { |method| after { send method } }
         end
       end
 

data/lib/rspec/rails/example.rb

@@ -13,30 +13,61 @@ RSpec::configure do |c|
     Regexp.compile(parts.join('[\\\/]') + '[\\\/]')
   end
 
-  c.include RSpec::Rails::ControllerExampleGroup, :type => :controller, :example_group => {
-    :file_path => c.escaped_path(%w[spec controllers])
-  }
-  c.include RSpec::Rails::HelperExampleGroup, :type => :helper, :example_group => {
-    :file_path => c.escaped_path(%w[spec helpers])
-  }
-  if defined?(RSpec::Rails::MailerExampleGroup)
-    c.include RSpec::Rails::MailerExampleGroup, :type => :mailer, :example_group => {
-      :file_path => c.escaped_path(%w[spec mailers])
+  controller_path_regex = c.escaped_path(%w[spec controllers])
+  c.include RSpec::Rails::ControllerExampleGroup,
+    :type          => :controller,
+    :example_group => lambda { |example_group, metadata|
+      metadata[:type].nil? && controller_path_regex =~ example_group[:file_path]
+    }
+
+  helper_path_regex = c.escaped_path(%w[spec helpers])
+  c.include RSpec::Rails::HelperExampleGroup,
+    :type          => :helper,
+    :example_group => lambda { |example_group, metadata|
+      metadata[:type].nil? && helper_path_regex =~ example_group[:file_path]
     }
+
+  mailer_path_regex = c.escaped_path(%w[spec mailers])
+  if defined?(RSpec::Rails::MailerExampleGroup)
+    c.include RSpec::Rails::MailerExampleGroup,
+      :type          => :mailer,
+      :example_group => lambda { |example_group, metadata|
+        metadata[:type].nil? && mailer_path_regex =~ example_group[:file_path]
+      }
   end
-  c.include RSpec::Rails::ModelExampleGroup, :type => :model, :example_group => {
-    :file_path => c.escaped_path(%w[spec models])
-  }
-  c.include RSpec::Rails::RequestExampleGroup, :type => :request, :example_group => {
-    :file_path => c.escaped_path(%w[spec (requests|integration|api)])
-  }
-  c.include RSpec::Rails::RoutingExampleGroup, :type => :routing, :example_group => {
-    :file_path => c.escaped_path(%w[spec routing])
-  }
-  c.include RSpec::Rails::ViewExampleGroup, :type => :view, :example_group => {
-    :file_path => c.escaped_path(%w[spec views])
-  }
-  c.include RSpec::Rails::FeatureExampleGroup, :type => :feature, :example_group => {
-    :file_path => c.escaped_path(%w[spec features])
-  }
+
+  model_path_regex = c.escaped_path(%w[spec models])
+  c.include RSpec::Rails::ModelExampleGroup,
+    :type          => :model,
+    :example_group => lambda { |example_group, metadata|
+      metadata[:type].nil? && model_path_regex =~ example_group[:file_path]
+    }
+
+  request_path_regex = c.escaped_path(%w[spec (requests|integration|api)])
+  c.include RSpec::Rails::RequestExampleGroup,
+    :type          => :request,
+    :example_group => lambda { |example_group, metadata|
+      metadata[:type].nil? && request_path_regex =~ example_group[:file_path]
+    }
+
+  routing_path_regex = c.escaped_path(%w[spec routing])
+  c.include RSpec::Rails::RoutingExampleGroup,
+    :type          => :routing,
+    :example_group => lambda { |example_group, metadata|
+      metadata[:type].nil? && routing_path_regex =~ example_group[:file_path]
+    }
+
+  view_path_regex = c.escaped_path(%w[spec views])
+  c.include RSpec::Rails::ViewExampleGroup,
+    :type          => :view,
+    :example_group => lambda { |example_group, metadata|
+      metadata[:type].nil? && view_path_regex =~ example_group[:file_path]
+    }
+
+  feature_example_regex = c.escaped_path(%w[spec features])
+  c.include RSpec::Rails::FeatureExampleGroup,
+    :type          => :feature,
+    :example_group => lambda { |example_group, metadata|
+      metadata[:type].nil? && feature_example_regex =~ example_group[:file_path]
+    }
 end