rspec-rails 3.0.0.beta1 → 3.0.0.beta2

data/lib/rspec/rails/matchers/relation_match_array.rb

@@ -1,3 +1,3 @@
 if defined?(ActiveRecord::Relation)
-  RSpec::Matchers::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
+  RSpec::Matchers::BuiltIn::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::ContainExactly)
 end

data/lib/rspec/rails/matchers/routing_matchers.rb

@@ -31,10 +31,14 @@ module RSpec::Rails::Matchers
       end
 
       # @api private
-      def failure_message_for_should
+      def failure_message
         rescued_exception.message
       end
 
+      def failure_message_when_negated
+        "expected #{@actual.inspect} not to route to #{@expected.inspect}"
+      end
+
       def description
         "route #{@actual.inspect} to #{@expected.inspect}"
       end
@@ -73,11 +77,11 @@ module RSpec::Rails::Matchers
         end
       end
 
-      def failure_message_for_should
+      def failure_message
         "expected #{@actual.inspect} to be routable"
       end
 
-      def failure_message_for_should_not
+      def failure_message_when_negated
         "expected #{@actual.inspect} not to be routable, but it routes to #{@routing_options.inspect}"
       end
     end

data/lib/rspec/rails/mocks.rb

@@ -1,3 +1,5 @@
+require 'active_support'
+require 'active_support/deprecation'
 require 'active_support/core_ext'
 require 'active_model'
 
@@ -29,6 +31,19 @@ module RSpec
         end
       end
 
+      # Starting with Rails 4.1, ActiveRecord associations are inversible
+      # by default. This class represents an association from the mocked
+      # model's perspective.
+      #
+      # @private
+      class Association
+        attr_accessor :target, :inversed
+
+        def initialize(association_name)
+          @association_name = association_name
+        end
+      end
+
       module ActiveRecordInstanceMethods
         # Stubs `persisted?` to return `false` and `id` to return `nil`.
         def destroy
@@ -45,6 +60,13 @@ module RSpec
         def new_record?
           !persisted?
         end
+
+        # Returns an object representing an association from the mocked
+        # model's perspective. For use by Rails internally only.
+        def association(association_name)
+          @associations ||= Hash.new { |h, k| h[k] = Association.new(k) }
+          @associations[association_name]
+        end
       end
 
       # Creates a test double representing `string_or_model_class` with common
@@ -110,39 +132,41 @@ EOM
               end
             end
           end
-          m.__send__(:__mock_proxy).instance_eval(<<-CODE, __FILE__, __LINE__)
-            def @object.is_a?(other)
-              #{model_class}.ancestors.include?(other)
-            end unless #{stubs.has_key?(:is_a?)}
 
-            def @object.kind_of?(other)
-              #{model_class}.ancestors.include?(other)
-            end unless #{stubs.has_key?(:kind_of?)}
+          msingleton = m.singleton_class
+          msingleton.__send__(:define_method, :is_a?) do |other|
+            model_class.ancestors.include?(other)
+          end unless stubs.has_key?(:is_a?)
 
-            def @object.instance_of?(other)
-              other == #{model_class}
-            end unless #{stubs.has_key?(:instance_of?)}
+          msingleton.__send__(:define_method, :kind_of?) do |other|
+            model_class.ancestors.include?(other)
+          end unless stubs.has_key?(:kind_of?)
 
-            def @object.__model_class_has_column?(method_name)
-              #{model_class}.respond_to?(:column_names) && #{model_class}.column_names.include?(method_name.to_s)
-            end
+          msingleton.__send__(:define_method, :instance_of?) do |other|
+            other == model_class
+          end unless stubs.has_key?(:instance_of?)
+
+          msingleton.__send__(:define_method, :__model_class_has_column?) do |method_name|
+            model_class.respond_to?(:column_names) && model_class.column_names.include?(method_name.to_s)
+          end
 
-            def @object.respond_to?(method_name, include_private=false)
-              __model_class_has_column?(method_name) ? true : super
-            end unless #{stubs.has_key?(:respond_to?)}
+          msingleton.__send__(:define_method, :respond_to?) do |method_name, *args|
+          include_private = args.first || false
+            __model_class_has_column?(method_name) ? true : super(method_name, include_private)
+          end unless stubs.has_key?(:respond_to?)
 
-            def @object.method_missing(m, *a, &b)
-              respond_to?(m) ? null_object? ? self : nil : super
-            end
+          msingleton.__send__(:define_method, :method_missing) do |m, *a, &b|
+            respond_to?(m) ? null_object? ? self : nil : super(m, *a, &b)
+          end
 
-            def @object.class
-              #{model_class}
-            end unless #{stubs.has_key?(:class)}
+          msingleton.__send__(:define_method, :class) do
+            model_class
+          end unless stubs.has_key?(:class)
 
-            def @object.to_s
-              "#{model_class.name}_#{to_param}"
-            end unless #{stubs.has_key?(:to_s)}
-          CODE
+          mock_param = to_param
+          msingleton.__send__(:define_method, :to_s) do
+            "#{model_class.name}_#{mock_param}"
+          end unless stubs.has_key?(:to_s)
           yield m if block_given?
         end
       end

data/lib/rspec/rails/vendor/capybara.rb

@@ -9,9 +9,11 @@ rescue LoadError
 end
 
 if defined?(Capybara)
+  require 'rspec/support/version_checker'
+  RSpec::Support::VersionChecker.new('capybara', Capybara::VERSION, '2.2.0').check_version!
+
   RSpec.configure do |c|
     if defined?(Capybara::DSL)
-      c.include Capybara::DSL, :type => :controller
       c.include Capybara::DSL, :type => :feature
     end
 
@@ -20,9 +22,7 @@ if defined?(Capybara)
       c.include Capybara::RSpecMatchers, :type => :helper
       c.include Capybara::RSpecMatchers, :type => :mailer
       c.include Capybara::RSpecMatchers, :type => :controller
-      c.include Capybara::RSpecMatchers, :example_group => {
-        :file_path => c.escaped_path(%w[spec features])
-      }
+      c.include Capybara::RSpecMatchers, :type => :feature
     end
 
     unless defined?(Capybara::RSpecMatchers) || defined?(Capybara::DSL)

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '3.0.0.beta1'
+      STRING = '3.0.0.beta2'
     end
   end
 end

data/spec/generators/rspec/controller/controller_generator_spec.rb

@@ -17,16 +17,16 @@ describe Rspec::Generators::ControllerGenerator do
       end
 
       describe 'the spec' do
-        it { should exist }
-        it { should contain(/require 'spec_helper'/) }
-        it { should contain(/describe PostsController/) }
+        it { is_expected.to exist }
+        it { is_expected.to contain(/require 'spec_helper'/) }
+        it { is_expected.to contain(/describe PostsController/) }
       end
     end
     describe 'skipped with a flag' do
       before do
         run_generator %w(posts --no-controller_specs)
       end
-      it { should_not exist }
+      it { is_expected.not_to exist }
     end
   end
 
@@ -38,7 +38,7 @@ describe Rspec::Generators::ControllerGenerator do
         end
         describe 'index.html.erb' do
           subject { file('spec/views/posts/index.html.erb_spec.rb') }
-          it { should_not exist }
+          it { is_expected.not_to exist }
         end
       end
       describe 'with no actions' do
@@ -47,7 +47,7 @@ describe Rspec::Generators::ControllerGenerator do
         end
         describe 'index.html.erb' do
           subject { file('spec/views/posts/index.html.erb_spec.rb') }
-          it { should_not exist }
+          it { is_expected.not_to exist }
         end
       end
 
@@ -58,7 +58,7 @@ describe Rspec::Generators::ControllerGenerator do
 
         describe 'index.html.erb' do
           subject { file('spec/views/posts/index.html._spec.rb') }
-          it { should_not exist }
+          it { is_expected.not_to exist }
         end
       end
     end
@@ -70,15 +70,15 @@ describe Rspec::Generators::ControllerGenerator do
         end
         describe 'index.html.erb' do
           subject { file('spec/views/posts/index.html.erb_spec.rb') }
-          it { should exist }
-          it { should contain(/require 'spec_helper'/) }
-          it { should contain(/describe "posts\/index.html.erb"/) }
+          it { is_expected.to exist }
+          it { is_expected.to contain(/require 'spec_helper'/) }
+          it { is_expected.to contain(/describe "posts\/index.html.erb"/) }
         end
         describe 'show.html.erb' do
           subject { file('spec/views/posts/show.html.erb_spec.rb') }
-          it { should exist }
-          it { should contain(/require 'spec_helper'/) }
-          it { should contain(/describe "posts\/show.html.erb"/) }
+          it { is_expected.to exist }
+          it { is_expected.to contain(/require 'spec_helper'/) }
+          it { is_expected.to contain(/describe "posts\/show.html.erb"/) }
         end
       end
       describe 'with haml' do
@@ -87,9 +87,9 @@ describe Rspec::Generators::ControllerGenerator do
         end
         describe 'index.html.haml' do
           subject { file('spec/views/posts/index.html.haml_spec.rb') }
-          it { should exist }
-          it { should contain(/require 'spec_helper'/) }
-          it { should contain(/describe "posts\/index.html.haml"/) }
+          it { is_expected.to exist }
+          it { is_expected.to contain(/require 'spec_helper'/) }
+          it { is_expected.to contain(/describe "posts\/index.html.haml"/) }
         end
       end
     end

data/spec/generators/rspec/feature/feature_generator_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by rails
+require 'generators/rspec/feature/feature_generator'
+
+describe Rspec::Generators::FeatureGenerator do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../../temp", __FILE__)
+
+  before { prepare_destination } 
+
+  describe 'feature specs' do
+    describe 'are generated independently from the command line' do
+      before do
+        run_generator %w(posts)
+      end
+      describe 'the spec' do
+        subject(:feature_spec) { file('spec/features/posts_spec.rb') }
+        it "exists" do
+          expect(feature_spec).to exist
+        end
+        it "contains 'spec_helper'" do
+          expect(feature_spec).to contain(/require 'spec_helper'/)
+        end
+        it "contains the feature" do
+          expect(feature_spec).to contain(/feature "Posts"/)
+        end
+      end
+    end
+
+    describe "are not generated" do
+      before do
+        run_generator %w(posts --no-feature-specs)
+      end
+      describe "the spec" do
+        subject(:feature_spec) { file('spec/features/posts_spec.rb') }
+        it "does not exist" do
+          expect(feature_spec).to_not exist
+        end
+      end
+    end
+  end
+end

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,30 +15,18 @@ 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
 
   describe 'are generated' do
-    describe 'without webrat matchers by default' do
-      before 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/) }
-    end
-    describe 'with webrat matchers' do
-      before do
-        run_generator %w(posts --webrat)
-      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(/visit posts_index_path/) }
+    before do
+      run_generator %w(posts)
     end
+    subject { file('spec/requests/posts_spec.rb') }
+    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
 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/FixtureSet.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