rspec-rails 2.99.0 → 3.0.0.beta1

data/lib/rspec/rails/example/controller_example_group.rb

@@ -55,53 +55,29 @@ module RSpec::Rails
       #       # ....
       #     end
       def controller(base_class = nil, &body)
-        root_controller = defined?(ApplicationController) ? ApplicationController : ActionController::Base
         base_class ||= RSpec.configuration.infer_base_class_for_anonymous_controllers? ?
                          controller_class :
-                         root_controller
-        base_class ||= root_controller
+                         ApplicationController
 
-        new_controller_class = Class.new(base_class) do
+        metadata[:example_group][:described_class] = Class.new(base_class) do
           def self.name; "AnonymousController"; end
         end
-        new_controller_class.class_eval(&body)
-
-        (class << self; self; end).__send__(:define_method, :controller_class) { new_controller_class }
-        metadata[:example_group].delete(:described_class)
-        metadata[:example_group].extend DescribedClassDeprecation.new(new_controller_class)
+        metadata[:example_group][:described_class].class_eval(&body)
 
+        orig_routes = nil
         before do
-          @orig_routes = self.routes
+          orig_routes = self.routes
           self.routes  = ActionDispatch::Routing::RouteSet.new.tap { |r|
             r.draw { resources :anonymous }
           }
         end
 
         after do
-          self.routes  = @orig_routes
+          self.routes  = orig_routes
           @orig_routes = nil
         end
       end
 
-      class DescribedClassDeprecation < Module
-        def initialize(value)
-          module_eval do
-            define_method :store_computed do |key|
-              return super(key) unless key == :described_class
-
-              RSpec.warn_deprecation(<<-EOS.gsub(/^\s+\|/,''))
-                |In RSpec 3, the `controller { }` macro no longer changes
-                |`described_class` to refer to the generated anonymous controller
-                |class. Instead of `described_class`, use `controller_class` to
-                |access the generated anonymous class.
-                |(`described_class` called from #{::RSpec::CallerFilter.first_non_rspec_line}.)
-              EOS
-              store(:described_class, value)
-            end
-          end
-        end
-      end
-
       # Specifies the routeset that will be used for the example group. This
       # is most useful when testing Rails engines.
       #
@@ -158,7 +134,7 @@ module RSpec::Rails
     # If method is a named_route, delegates to the RouteSet associated with
     # this controller.
     def method_missing(method, *args, &block)
-      if @routes && @routes.named_routes.helpers.include?(method)
+      if defined?(@routes) && @routes.named_routes.helpers.include?(method)
         controller.send(method, *args, &block)
       elsif defined?(@orig_routes) && @orig_routes && @orig_routes.named_routes.helpers.include?(method)
         controller.send(method, *args, &block)

data/lib/rspec/rails/example/view_example_group.rb

@@ -152,9 +152,6 @@ module RSpec::Rails
           view.lookup_context.prefixes << _controller_path
         end
 
-        # fixes bug with differing formats
-        view.lookup_context.view_paths.each(&:clear_cache)
-
         controller.controller_path = _controller_path
         controller.request.path_parameters[:controller] = _controller_path
         controller.request.path_parameters[:action]     = _inferred_action unless _inferred_action =~ /^_/

data/lib/rspec/rails/matchers.rb

@@ -1,4 +1,4 @@
-require 'rspec/core/deprecation'
+require 'rspec/core/warnings'
 require 'rspec/expectations'
 
 module RSpec::Rails
@@ -22,6 +22,5 @@ require 'rspec/rails/matchers/redirect_to'
 require 'rspec/rails/matchers/routing_matchers'
 require 'rspec/rails/matchers/be_new_record'
 require 'rspec/rails/matchers/be_a_new'
-require 'rspec/rails/matchers/have_extension'
 require 'rspec/rails/matchers/relation_match_array'
 require 'rspec/rails/matchers/be_valid'

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

@@ -17,7 +17,7 @@ module RSpec::Rails::Matchers
     #
     #     it "assigns a new Thing with the submitted attributes" do
     #       post :create, :thing => { :name => "Illegal Value" }
-    #       assigns(:thing).should be_a_new(Thing).with(:name => nil)
+    #       expect(assigns).to(:thing) be_a_new(Thing).with(:name => nil)
     #     end
     def with(expected_attributes)
       attributes.merge!(expected_attributes)

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

@@ -20,7 +20,7 @@ module RSpec::Rails::Matchers
   # @example
   #
   #     get :new
-  #     assigns(:thing).should be_new_record
+  #     expect(assigns(:thing)).to be_new_record
   def be_new_record
     BeANewRecord.new
   end

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

@@ -33,7 +33,7 @@ module RSpec::Rails::Matchers
   # @example
   #
   #     thing = Thing.new
-  #     thing.should be_valid
+  #     expect(thing).to be_valid
   def be_valid(*args)
     BeValid.new(*args)
   end

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

@@ -30,7 +30,7 @@ module RSpec::Rails::Matchers
     #
     # @example
     #
-    #     response.should have_rendered("new")
+    #     expect(response).to have_rendered("new")
     def have_rendered(options, message=nil)
       RenderTemplateMatcher.new(self, options, message)
     end

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

@@ -29,7 +29,7 @@ module RSpec::Rails::Matchers
     #
     # @example
     #
-    #     response.should redirect_to(:action => "new")
+    #     expect(response).to redirect_to(:action => "new")
     def redirect_to(target)
       RedirectTo.new(self, target)
     end

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

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

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

@@ -14,7 +14,7 @@ module RSpec::Rails::Matchers
           @expected.merge!(:controller => controller, :action => action)
         end
       end
-      
+
       # @api private
       def matches?(verb_to_path_map)
         @actual = @verb_to_path_map = verb_to_path_map
@@ -35,10 +35,6 @@ module RSpec::Rails::Matchers
         rescued_exception.message
       end
 
-      def failure_message_for_should_not
-        "expected #{@actual.inspect} not to route to #{@expected.inspect}"
-      end
-
       def description
         "route #{@actual.inspect} to #{@expected.inspect}"
       end
@@ -49,12 +45,12 @@ module RSpec::Rails::Matchers
     #
     # @example
     #
-    #     { :get => "/things/special" }.should route_to(
+    #     expect(:get => "/things/special").to route_to(
     #       :controller => "things",
     #       :action     => "special"
     #     )
     #
-    #     { :get => "/things/special" }.should route_to("things#special")
+    #     expect(:get => "/things/special").to route_to("things#special")
     #
     # @see http://api.rubyonrails.org/classes/ActionDispatch/Assertions/RoutingAssertions.html#method-i-assert_recognizes
     def route_to(*expected)
@@ -93,9 +89,9 @@ module RSpec::Rails::Matchers
     # @example
     #
     # You can use route helpers provided by rspec-rails.
-    #     {:get =>  "/a/path"}.should be_routable
-    #     {:post => "/another/path"}.should be_routable
-    #     {:put => "/yet/another/path"}.should_not be_routable
+    #     expect(:get  => "/a/path").to be_routable
+    #     expect(:post => "/another/path").to be_routable
+    #     expect(:put  => "/yet/another/path").to be_routable
     def be_routable
       BeRoutableMatcher.new(self)
     end

data/lib/rspec/rails/mocks.rb

@@ -1,5 +1,3 @@
-require 'active_support'
-require 'active_support/deprecation'
 require 'active_support/core_ext'
 require 'active_model'
 
@@ -31,19 +29,6 @@ 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
@@ -60,13 +45,6 @@ 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
@@ -87,13 +65,12 @@ module RSpec
       #   * A String representing a Class that extends ActiveModel::Naming
       #   * A Class that extends ActiveModel::Naming
       def mock_model(string_or_model_class, stubs = {})
-        RSpec.deprecate("`mock_model`", :replacement => "the `rspec-activemodel-mocks` gem")
         if String === string_or_model_class
           if Object.const_defined?(string_or_model_class)
             model_class = Object.const_get(string_or_model_class)
           else
             model_class = Object.const_set(string_or_model_class, Class.new do
-              extend ::ActiveModel::Naming
+              extend ActiveModel::Naming
               def self.primary_key; :id; end
             end)
           end
@@ -101,7 +78,7 @@ module RSpec
           model_class = string_or_model_class
         end
 
-        unless model_class.kind_of? ::ActiveModel::Naming
+        unless model_class.kind_of? ActiveModel::Naming
           raise ArgumentError.new <<-EOM
 The mock_model method can only accept as its first argument:
   * A String representing a Class that does not exist
@@ -123,8 +100,8 @@ EOM
           m.singleton_class.class_eval do
             include ActiveModelInstanceMethods
             include ActiveRecordInstanceMethods if defined?(ActiveRecord)
-            include ::ActiveModel::Conversion
-            include ::ActiveModel::Validations
+            include ActiveModel::Conversion
+            include ActiveModel::Validations
           end
           if defined?(ActiveRecord)
             [:save, :update_attributes, :update].each do |key|
@@ -150,10 +127,6 @@ EOM
               #{model_class}.respond_to?(:column_names) && #{model_class}.column_names.include?(method_name.to_s)
             end
 
-            def @object.has_attribute?(attr_name)
-              __model_class_has_column?(attr_name)
-            end unless #{stubs.has_key?(:has_attribute?)}
-
             def @object.respond_to?(method_name, include_private=false)
               __model_class_has_column?(method_name) ? true : super
             end unless #{stubs.has_key?(:respond_to?)}
@@ -235,7 +208,6 @@ EOM
       #     stub_model(Person, :to_param => 37)
       #     stub_model(Person) {|person| person.first_name = "David"}
       def stub_model(model_class, stubs={})
-        RSpec.deprecate("`stub_model`", :replacement => "the `rspec-activemodel-mocks` gem")
         model_class.new.tap do |m|
           m.extend ActiveModelStubExtensions
           if defined?(ActiveRecord) && model_class < ActiveRecord::Base
@@ -273,12 +245,4 @@ EOM
   end
 end
 
-# We need to check if rspec-activemodel-mocks is in use on this side due
-# to Rails defaults. Because rspec-activemodel-mocks does not depend on
-# rspec-rails, bundler is likely to require rspec-activemodel-mocks before
-# rspec-rails when Bundler.require is performed. This will result in the
-# user still getting a deprecation message even when they are doing
-# everything right.
-unless defined?(RSpec::ActiveModel::Mocks::Mocks)
-  RSpec.configuration.include RSpec::Rails::Mocks
-end
+RSpec.configuration.include RSpec::Rails::Mocks

data/lib/rspec/rails/tasks/rspec.rake

@@ -3,12 +3,14 @@ if default = Rake.application.instance_variable_get('@tasks')['default']
   default.prerequisites.delete('test')
 end
 
+spec_prereq = Rails.configuration.generators.options[:rails][:orm] == :active_record ?  "test:prepare" : :noop
+task :noop do; end
 task :default => :spec
 
 task :stats => "spec:statsetup"
 
 desc "Run all specs in spec directory (excluding plugin specs)"
-RSpec::Core::RakeTask.new(:spec => "spec:prepare")
+RSpec::Core::RakeTask.new(:spec => spec_prereq)
 
 namespace :spec do
   types = begin
@@ -19,18 +21,9 @@ namespace :spec do
             Hash[dirs.map { |d| [d.split('/').last, d] }]
           end
 
-  task :prepare do
-    ENV['RACK_ENV'] = ENV['RAILS_ENV'] = 'test'
-    if Rails.configuration.generators.options[:rails][:orm] == :active_record
-      if ::Rails::VERSION::STRING.to_f < 4.1
-        Rake::Task["test:prepare"].invoke
-      end
-    end
-  end
-
   types.each do |type, dir|
     desc "Run the code examples in #{dir}"
-    RSpec::Core::RakeTask.new(type => "spec:prepare") do |t|
+    RSpec::Core::RakeTask.new(type => spec_prereq) do |t|
       t.pattern = "./#{dir}/**/*_spec.rb"
     end
   end
@@ -38,7 +31,7 @@ namespace :spec do
   # RCov task only enabled for Ruby 1.8
   if RUBY_VERSION < '1.9'
     desc "Run all specs with rcov"
-    RSpec::Core::RakeTask.new(:rcov => "spec:prepare") do |t|
+    RSpec::Core::RakeTask.new(:rcov => spec_prereq) do |t|
       t.rcov = true
       t.pattern = "./spec/**/*_spec.rb"
       t.rcov_opts = '--exclude /gems/,/Library/,/usr/,lib/tasks,.bundle,config,/lib/rspec/,/lib/rspec-,spec'

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

@@ -9,42 +9,9 @@ rescue LoadError
 end
 
 if defined?(Capybara)
-  module RSpec::Rails::DeprecatedCapybaraDSL
-    include ::Capybara::DSL
-
-    def self.included(mod)
-      mod.extend(ClassMethods)
-      super
-    end
-
-    module ClassMethods
-      def include(mod)
-        if mod == ::Capybara::DSL
-          class_variable_set(:@@_rspec_capybara_included_explicitly, true)
-        end
-
-        super
-      end
-    end
-
-    ::Capybara::DSL.instance_methods(false).each do |method|
-      # capybara internally calls `page`, skip to avoid a duplicate
-      # deprecation warning
-      next if method.to_s == 'page'
-
-      define_method method do |*args, &blk|
-        unless self.class.class_variable_defined?(:@@_rspec_capybara_included_explicitly)
-          RSpec.deprecate "Using the capybara method `#{method}` in controller specs",
-            :replacement => "feature specs (spec/features)"
-        end
-        super(*args, &blk)
-      end
-    end
-  end
-
   RSpec.configure do |c|
     if defined?(Capybara::DSL)
-      c.include ::RSpec::Rails::DeprecatedCapybaraDSL, :type => :controller
+      c.include Capybara::DSL, :type => :controller
       c.include Capybara::DSL, :type => :feature
     end
 
@@ -53,7 +20,9 @@ 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, :type => :feature
+      c.include Capybara::RSpecMatchers, :example_group => {
+        :file_path => c.escaped_path(%w[spec features])
+      }
     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 = '2.99.0'
+      STRING = '3.0.0.beta1'
     end
   end
 end

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

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/rspec/controller/controller_generator'
+
+describe Rspec::Generators::ControllerGenerator do
+  # Tell the generator where to put its output (what it thinks of as Rails.root)
+  destination File.expand_path("../../../../../tmp", __FILE__)
+
+  before { prepare_destination }
+
+  describe 'controller specs' do
+    subject { file('spec/controllers/posts_controller_spec.rb') }
+    describe 'generated by default' do
+      before do
+        run_generator %w(posts)
+      end
+
+      describe 'the spec' do
+        it { should exist }
+        it { should contain(/require 'spec_helper'/) }
+        it { should 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 }
+    end
+  end
+
+  describe 'view specs' do
+    describe 'are not generated' do
+      describe 'with no-view-spec flag' do
+        before do
+          run_generator %w(posts index show --no-view-specs)
+        end
+        describe 'index.html.erb' do
+          subject { file('spec/views/posts/index.html.erb_spec.rb') }
+          it { should_not exist }
+        end
+      end
+      describe 'with no actions' do
+        before do
+          run_generator %w(posts)
+        end
+        describe 'index.html.erb' do
+          subject { file('spec/views/posts/index.html.erb_spec.rb') }
+          it { should_not exist }
+        end
+      end
+
+      describe 'with --no-template-engine' do
+        before do
+          run_generator %w(posts index --no-template-engine)
+        end
+
+        describe 'index.html.erb' do
+          subject { file('spec/views/posts/index.html._spec.rb') }
+          it { should_not exist }
+        end
+      end
+    end
+
+    describe 'are generated' do
+      describe 'with default template engine' do
+        before do
+          run_generator %w(posts index show)
+        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"/) }
+        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"/) }
+        end
+      end
+      describe 'with haml' do
+        before do
+          run_generator %w(posts index --template_engine haml)
+        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"/) }
+        end
+      end
+    end
+  end
+end