rspec-rails 2.99.0.beta1 → 2.99.0.beta2

data/spec/generators/rspec/helper/helper_generator_spec.rb

@@ -16,15 +16,15 @@ describe Rspec::Generators::HelperGenerator do
     end
 
     describe 'the spec' do
-      it { should exist }
-      it { should contain(/require 'spec_helper'/) }
-      it { should contain(/describe PostsHelper/) }
+      it { is_expected.to exist }
+      it { is_expected.to contain(/require 'spec_helper'/) }
+      it { is_expected.to contain(/describe PostsHelper/) }
     end
   end
   describe 'skipped with a flag' do
     before do
       run_generator %w(posts --no-helper_specs)
     end
-    it { should_not exist }
+    it { is_expected.not_to exist }
   end
 end

data/spec/generators/rspec/install/install_generator_spec.rb

@@ -8,23 +8,23 @@ describe Rspec::Generators::InstallGenerator do
 
   it "generates .rspec" do
     run_generator
-    file('.rspec').should exist
+    expect(file('.rspec')).to exist
   end
 
   it "generates spec/spec_helper.rb" do
     run_generator
-    File.read( file('spec/spec_helper.rb') ).should =~ /^require 'rspec\/autorun'$/m
+    expect(File.read( file('spec/spec_helper.rb') )).to match(/^require 'rspec\/rails'$/m)
   end
 
   if ::Rails::VERSION::STRING >= '4'
     it "generates spec/spec_helper.rb with a check for pending migrations" do
       run_generator
-      File.read( file('spec/spec_helper.rb') ).should =~ /ActiveRecord::Migration\.check_pending!/m
+      expect(File.read( file('spec/spec_helper.rb') )).to match(/ActiveRecord::Migration\.check_pending!/m)
     end
   else
     it "generates spec/spec_helper.rb without a check for pending migrations" do
       run_generator
-      File.read( file('spec/spec_helper.rb') ).should_not =~ /ActiveRecord::Migration\.check_pending!/m
+      expect(File.read( file('spec/spec_helper.rb') )).not_to match(/ActiveRecord::Migration\.check_pending!/m)
     end
   end
 end

data/spec/generators/rspec/integration/integration_generator_spec.rb

@@ -15,7 +15,7 @@ describe Rspec::Generators::IntegrationGenerator do
     end
     describe 'index.html.erb' do
       subject { file('spec/requests/posts_spec.rb') }
-      it { should_not exist }
+      it { is_expected.not_to exist }
     end
   end
 
@@ -25,11 +25,12 @@ describe Rspec::Generators::IntegrationGenerator do
         run_generator %w(posts)
       end
       subject { file('spec/requests/posts_spec.rb') }
-      it { should exist }
-      it { should contain(/require 'spec_helper'/) }
-      it { should contain(/describe "GET \/posts"/) }
-      it { should contain(/get posts_index_path/) }
+      it { is_expected.to exist }
+      it { is_expected.to contain(/require 'spec_helper'/) }
+      it { is_expected.to contain(/describe "GET \/posts"/) }
+      it { is_expected.to contain(/get posts_index_path/) }
     end
+
     describe 'with webrat matchers' do
       before do
         run_generator %w(posts --webrat)
@@ -40,5 +41,17 @@ describe Rspec::Generators::IntegrationGenerator do
       it { should contain(/describe "GET \/posts"/) }
       it { should contain(/visit posts_index_path/) }
     end
+
+    describe 'the webrat option' do
+      it 'is deprecated when invoked as --webrat' do
+        expect(RSpec).to receive(:deprecate).with("the --webrat option", :replacement => nil)
+        run_generator %w(posts --webrat)
+      end
+
+      it 'is deprecated when invoked as --webrat-matchers' do
+        expect(RSpec).to receive(:deprecate).with("the --webrat-matchers option", :replacement => nil)
+        run_generator %w(posts --webrat-matchers)
+      end
+    end
   end
 end

data/spec/generators/rspec/mailer/mailer_generator_spec.rb

@@ -15,18 +15,18 @@ describe Rspec::Generators::MailerGenerator do
       before do
         run_generator %w(posts index show)
       end
-      it { should exist }
-      it { should contain(/require "spec_helper"/) }
-      it { should contain(/describe "index" do/) }
-      it { should contain(/describe "show" do/) }
+      it { is_expected.to exist }
+      it { is_expected.to contain(/require "spec_helper"/) }
+      it { is_expected.to contain(/describe "index" do/) }
+      it { is_expected.to contain(/describe "show" do/) }
     end
     describe 'creates placeholder when no actions specified' do
       before do
         run_generator %w(posts)
       end
-      it { should exist }
-      it { should contain(/require "spec_helper"/) }
-      it { should contain(/pending "add some examples to \(or delete\)/) }
+      it { is_expected.to exist }
+      it { is_expected.to contain(/require "spec_helper"/) }
+      it { is_expected.to contain(/pending "add some examples to \(or delete\)/) }
     end
   end
 
@@ -36,13 +36,13 @@ describe Rspec::Generators::MailerGenerator do
     end
     describe 'index' do
       subject { file('spec/fixtures/posts/index') }
-      it { should exist }
-      it { should contain(/Posts#index/) }
+      it { is_expected.to exist }
+      it { is_expected.to contain(/Posts#index/) }
     end
     describe 'show' do
       subject { file('spec/fixtures/posts/show') }
-      it { should exist }
-      it { should contain(/Posts#show/) }
+      it { is_expected.to exist }
+      it { is_expected.to contain(/Posts#show/) }
     end
   end
 end

data/spec/generators/rspec/model/model_generator_spec.rb

@@ -11,8 +11,8 @@ describe Rspec::Generators::ModelGenerator do
 
   it 'runs both the model and fixture tasks' do
     gen = generator %w(posts)
-    gen.should_receive :create_model_spec
-    gen.should_receive :create_fixture_file
+    expect(gen).to receive :create_model_spec
+    expect(gen).to receive :create_fixture_file
     capture(:stdout) { gen.invoke_all }
   end
 
@@ -25,15 +25,15 @@ describe Rspec::Generators::ModelGenerator do
       describe 'the spec' do
         subject { file('spec/models/posts_spec.rb') }
 
-        it { should exist }
-        it { should contain(/require 'spec_helper'/) }
-        it { should contain(/describe Posts/) }
+        it { is_expected.to exist }
+        it { is_expected.to contain(/require 'spec_helper'/) }
+        it { is_expected.to contain(/describe Posts/) }
       end
 
       describe 'the fixtures' do
         subject { file('spec/fixtures/posts.yml') }
 
-        it { should contain(Regexp.new('# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html')) }
+        it { is_expected.to contain(Regexp.new('# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html')) }
       end
     end
 
@@ -45,7 +45,7 @@ describe Rspec::Generators::ModelGenerator do
       describe 'the fixtures' do
         subject { file('spec/fixtures/posts.yml') }
 
-        it { should_not exist }
+        it { is_expected.not_to exist }
       end
     end
   end

data/spec/generators/rspec/observer/observer_generator_spec.rb

@@ -14,8 +14,8 @@ describe Rspec::Generators::ObserverGenerator do
   end
 
   describe 'the spec' do
-    it { should exist }
-    it { should contain(/require 'spec_helper'/) }
-    it { should contain(/describe PostsObserver/) }
+    it { is_expected.to exist }
+    it { is_expected.to contain(/require 'spec_helper'/) }
+    it { is_expected.to contain(/describe PostsObserver/) }
   end
 end

data/spec/generators/rspec/scaffold/scaffold_generator_spec.rb

@@ -12,14 +12,14 @@ describe Rspec::Generators::ScaffoldGenerator do
 
     describe 'with no options' do
       before { run_generator %w(posts) }
-      it { should contain(/require 'spec_helper'/) }
-      it { should contain(/describe PostsController/) }
-      it { should contain(%({ "these" => "params" })) }
+      it { is_expected.to contain(/require 'spec_helper'/) }
+      it { is_expected.to contain(/describe PostsController/) }
+      it { is_expected.to contain(%({ "these" => "params" })) }
     end
 
     describe 'with --no-controller_specs' do
       before { run_generator %w(posts --no-controller_specs) }
-      it { should_not exist }
+      it { is_expected.not_to exist }
     end
   end
 
@@ -27,13 +27,13 @@ describe Rspec::Generators::ScaffoldGenerator do
     subject { file('spec/controllers/posts_controller_spec.rb') }
     before { run_generator %w(posts title:string) }
 
-    it { should contain(%({ "title" => "MyString" })) }
+    it { is_expected.to contain(%({ "title" => "MyString" })) }
   end
 
   describe 'namespaced controller spec' do
     subject { file('spec/controllers/admin/posts_controller_spec.rb') }
     before  { run_generator %w(admin/posts) }
-    it { should contain(/describe Admin::PostsController/)}
+    it { is_expected.to contain(/describe Admin::PostsController/)}
   end
 
   describe 'view specs' do
@@ -41,34 +41,34 @@ describe Rspec::Generators::ScaffoldGenerator do
       before { run_generator %w(posts) }
       describe 'edit' do
         subject { file("spec/views/posts/edit.html.erb_spec.rb") }
-        it { should exist }
-        it { should contain(/require 'spec_helper'/) }
-        it { should contain(/describe "(.*)\/edit"/) }
-        it { should contain(/it "renders the edit (.*) form"/) }
+        it { is_expected.to exist }
+        it { is_expected.to contain(/require 'spec_helper'/) }
+        it { is_expected.to contain(/describe "(.*)\/edit"/) }
+        it { is_expected.to contain(/it "renders the edit (.*) form"/) }
       end
 
       describe 'index' do
         subject { file("spec/views/posts/index.html.erb_spec.rb") }
-        it { should exist }
-        it { should contain(/require 'spec_helper'/) }
-        it { should contain(/describe "(.*)\/index"/) }
-        it { should contain(/it "renders a list of (.*)"/) }
+        it { is_expected.to exist }
+        it { is_expected.to contain(/require 'spec_helper'/) }
+        it { is_expected.to contain(/describe "(.*)\/index"/) }
+        it { is_expected.to contain(/it "renders a list of (.*)"/) }
       end
 
       describe 'new' do
         subject { file("spec/views/posts/new.html.erb_spec.rb") }
-        it { should exist }
-        it { should contain(/require 'spec_helper'/) }
-        it { should contain(/describe "(.*)\/new"/) }
-        it { should contain(/it "renders new (.*) form"/) }
+        it { is_expected.to exist }
+        it { is_expected.to contain(/require 'spec_helper'/) }
+        it { is_expected.to contain(/describe "(.*)\/new"/) }
+        it { is_expected.to contain(/it "renders new (.*) form"/) }
       end
 
       describe 'show' do
         subject { file("spec/views/posts/show.html.erb_spec.rb") }
-        it { should exist }
-        it { should contain(/require 'spec_helper'/) }
-        it { should contain(/describe "(.*)\/show"/) }
-        it { should contain(/it "renders attributes in <p>"/) }
+        it { is_expected.to exist }
+        it { is_expected.to contain(/require 'spec_helper'/) }
+        it { is_expected.to contain(/describe "(.*)\/show"/) }
+        it { is_expected.to contain(/it "renders attributes in <p>"/) }
       end
     end
 
@@ -76,22 +76,22 @@ describe Rspec::Generators::ScaffoldGenerator do
       before { run_generator %w(posts --no-template-engine) }
       describe 'edit' do
         subject { file("spec/views/posts/edit.html._spec.rb") }
-        it { should_not exist }
+        it { is_expected.not_to exist }
       end
 
       describe 'index' do
         subject { file("spec/views/posts/index.html._spec.rb") }
-        it { should_not exist }
+        it { is_expected.not_to exist }
       end
 
       describe 'new' do
         subject { file("spec/views/posts/new.html._spec.rb") }
-        it { should_not exist }
+        it { is_expected.not_to exist }
       end
 
       describe 'show' do
         subject { file("spec/views/posts/show.html._spec.rb") }
-        it { should_not exist }
+        it { is_expected.not_to exist }
       end
     end
 
@@ -100,22 +100,22 @@ describe Rspec::Generators::ScaffoldGenerator do
 
       describe 'edit' do
         subject { file("spec/views/posts/edit.html.erb_spec.rb") }
-        it { should_not exist }
+        it { is_expected.not_to exist }
       end
 
       describe 'index' do
         subject { file("spec/views/posts/index.html.erb_spec.rb") }
-        it { should_not exist }
+        it { is_expected.not_to exist }
       end
 
       describe 'new' do
         subject { file("spec/views/posts/new.html.erb_spec.rb") }
-        it { should_not exist }
+        it { is_expected.not_to exist }
       end
 
       describe 'show' do
         subject { file("spec/views/posts/show.html.erb_spec.rb") }
-        it { should_not exist }
+        it { is_expected.not_to exist }
       end
     end
   end
@@ -125,14 +125,26 @@ describe Rspec::Generators::ScaffoldGenerator do
 
     describe 'with default options' do
       before { run_generator %w(posts) }
-      it { should contain(/require "spec_helper"/) }
-      it { should contain(/describe PostsController/) }
-      it { should contain(/describe "routing"/) }
+      it { is_expected.to contain(/require "spec_helper"/) }
+      it { is_expected.to contain(/describe PostsController/) }
+      it { is_expected.to contain(/describe "routing"/) }
     end
 
     describe 'with --no-routing-specs' do
       before { run_generator %w(posts --no-routing_specs) }
-      it { should_not exist }
+      it { is_expected.not_to exist }
+    end
+  end
+
+  describe 'the webrat option' do
+    it 'is deprecated when invoked as --webrat' do
+      expect(RSpec).to receive(:deprecate).with("the --webrat option", :replacement => nil)
+      run_generator %w(posts --webrat)
+    end
+
+    it 'is deprecated when invoked as --webrat-matchers' do
+      expect(RSpec).to receive(:deprecate).with("the --webrat-matchers option", :replacement => nil)
+      run_generator %w(posts --webrat-matchers)
     end
   end
 end

data/spec/generators/rspec/view/view_generator_spec.rb

@@ -13,8 +13,8 @@ describe Rspec::Generators::ViewGenerator do
     it 'generates a spec for the supplied action' do
       run_generator %w(posts index)
       file('spec/views/posts/index.html.erb_spec.rb').tap do |f|
-        f.should contain(/require 'spec_helper'/)
-        f.should contain(/describe "posts\/index"/)
+        expect(f).to contain(/require 'spec_helper'/)
+        expect(f).to contain(/describe "posts\/index"/)
       end
     end
 
@@ -22,8 +22,8 @@ describe Rspec::Generators::ViewGenerator do
       it 'generates a spec for the supplied action' do
         run_generator %w(admin/posts index)
         file('spec/views/admin/posts/index.html.erb_spec.rb').tap do |f|
-          f.should contain(/require 'spec_helper'/)
-          f.should contain(/describe "admin\/posts\/index"/)
+          expect(f).to contain(/require 'spec_helper'/)
+          expect(f).to contain(/describe "admin\/posts\/index"/)
         end
       end
     end
@@ -33,8 +33,8 @@ describe Rspec::Generators::ViewGenerator do
     it 'generates a spec for the supplied action' do
       run_generator %w(posts index --template_engine haml)
       file('spec/views/posts/index.html.haml_spec.rb').tap do |f|
-        f.should contain(/require 'spec_helper'/)
-        f.should contain(/describe "posts\/index"/)
+        expect(f).to contain(/require 'spec_helper'/)
+        expect(f).to contain(/describe "posts\/index"/)
       end
     end
   end

data/spec/rspec/rails/assertion_adapter_spec.rb

@@ -13,16 +13,16 @@ describe RSpec::Rails::MinitestAssertionAdapter do
       end
     else
       it "exposes #{m} to host examples" do
-        methods.should include(m)
+        expect(methods).to include(m)
       end
     end
   end
 
   it "does not expose internal methods of Minitest" do
-    methods.should_not include("_assertions")
+    expect(methods).not_to include("_assertions")
   end
 
   it "does not expose Minitest's message method" do
-    methods.should_not include("message")
+    expect(methods).not_to include("message")
   end
 end

data/spec/rspec/rails/configuration_spec.rb

@@ -11,7 +11,7 @@ describe "configuration" do
 
   describe "#render_views?" do
     it "is false by default" do
-      RSpec.configuration.render_views?.should be_falsey
+      expect(RSpec.configuration.render_views?).to be_falsey
     end
   end
 
@@ -20,7 +20,7 @@ describe "configuration" do
       RSpec.configuration.render_views = false
       RSpec.configuration.render_views
 
-      RSpec.configuration.render_views?.should be_truthy
+      expect(RSpec.configuration.render_views?).to be_truthy
     end
   end
 end

data/spec/rspec/rails/deprecations_spec.rb

@@ -10,7 +10,7 @@ describe "rspec-rails-2 deprecations" do
       end
 
       it "is deprecated" do
-        RSpec.should_receive(:deprecate)
+        expect(RSpec).to receive(:deprecate)
         group.integrate_views
       end
     end

data/spec/rspec/rails/example/controller_example_group_spec.rb

@@ -5,8 +5,8 @@ end
 
 module RSpec::Rails
   describe ControllerExampleGroup do
-    it { should be_included_in_files_in('./spec/controllers/') }
-    it { should be_included_in_files_in('.\\spec\\controllers\\') }
+    it { is_expected.to be_included_in_files_in('./spec/controllers/') }
+    it { is_expected.to be_included_in_files_in('.\\spec\\controllers\\') }
 
     let(:group) do
       RSpec::Core::ExampleGroup.describe do
@@ -15,19 +15,19 @@ module RSpec::Rails
     end
 
     it "includes routing matchers" do
-      group.included_modules.should include(RSpec::Rails::Matchers::RoutingMatchers)
+      expect(group.included_modules).to include(RSpec::Rails::Matchers::RoutingMatchers)
     end
 
     it "adds :type => :controller to the metadata" do
-      group.metadata[:type].should eq(:controller)
+      expect(group.metadata[:type]).to eq(:controller)
     end
 
     context "with implicit subject" do
       it "uses the controller as the subject" do
         controller = double('controller')
         example = group.new
-        example.stub(:controller => controller)
-        example.subject.should == controller
+        allow(example).to receive(:controller).and_return(controller)
+        expect(example.subject).to eq(controller)
       end
     end
 
@@ -35,7 +35,7 @@ module RSpec::Rails
       it "uses the specified subject instead of the controller" do
         group.subject { 'explicit' }
         example = group.new
-        example.subject.should == 'explicit'
+        expect(example.subject).to eq('explicit')
       end
     end
 
@@ -48,10 +48,10 @@ module RSpec::Rails
 
       it "delegates named route helpers to the underlying controller" do
         controller = double('controller')
-        controller.stub(:foos_url).and_return('http://test.host/foos')
+        allow(controller).to receive(:foos_url).and_return('http://test.host/foos')
 
         example = group.new
-        example.stub(:controller => controller)
+        allow(example).to receive(:controller).and_return(controller)
 
         # As in the routing example spec, this is pretty invasive, but not sure
         # how to do it any other way as the correct operation relies on before
@@ -60,7 +60,7 @@ module RSpec::Rails
         routes.draw { resources :foos }
         example.instance_variable_set(:@orig_routes, routes)
 
-        example.foos_url.should eq('http://test.host/foos')
+        expect(example.foos_url).to eq('http://test.host/foos')
       end
     end
 
@@ -77,23 +77,49 @@ module RSpec::Rails
 
     describe "with inferred anonymous controller" do
       before do
-        group.stub(:controller_class).and_return(Class.new)
+        allow(group).to receive(:controller_class).and_return(Class.new)
       end
 
-      it "infers the anonymous controller class when infer_base_class_for_anonymous_controllers is true" do
-        RSpec.configuration.stub(:infer_base_class_for_anonymous_controllers?).and_return(true)
-        group.controller { }
+      context "when infer_base_class_for_anonymous_controllers is true" do
+        before do
+          allow(RSpec.configuration).to receive(:infer_base_class_for_anonymous_controllers?).and_return(true)
+        end
+
+        it "infers the anonymous controller class" do
+          group.controller { }
+
+          controller_class = group.metadata[:example_group][:described_class]
+          expect(controller_class.superclass).to eq(group.controller_class)
+        end
+
+        it "infers the anonymous controller class when no ApplicationController is present" do
+          hide_const '::ApplicationController'
+          group.controller { }
 
-        controller_class = group.metadata[:example_group][:described_class]
-        controller_class.superclass.should eq(group.controller_class)
+          controller_class = group.metadata[:example_group][:described_class]
+          expect(controller_class.superclass).to eq(group.controller_class)
+        end
       end
 
-      it "sets the anonymous controller class to ApplicationController when infer_base_class_for_anonymous_controllers is false" do
-        RSpec.configuration.stub(:infer_base_class_for_anonymous_controllers?).and_return(false)
-        group.controller { }
+      context "when infer_base_class_for_anonymous_controllers is false" do
+        before do
+          allow(RSpec.configuration).to receive(:infer_base_class_for_anonymous_controllers?).and_return(false)
+        end
+
+        it "sets the anonymous controller class to ApplicationController" do
+          group.controller { }
+
+          controller_class = group.metadata[:example_group][:described_class]
+          expect(controller_class.superclass).to eq(ApplicationController)
+        end
+
+        it "sets the anonymous controller class to ActiveController::Base when no ApplicationController is present" do
+          hide_const '::ApplicationController'
+          group.controller { }
 
-        controller_class = group.metadata[:example_group][:described_class]
-        controller_class.superclass.should eq(ApplicationController)
+          controller_class = group.metadata[:example_group][:described_class]
+          expect(controller_class.superclass).to eq(ActionController::Base)
+        end
       end
     end
   end