rspec-rails 2.14.2 → 2.99.0.beta1

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

@@ -8,12 +8,7 @@ require 'rspec/autorun'
 # in spec/support/ and its subdirectories.
 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)

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/controller_example_group.rb

@@ -55,10 +55,9 @@ 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
+                         ApplicationController
 
         metadata[:example_group][:described_class] = Class.new(base_class) do
           def self.name; "AnonymousController"; end

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

@@ -25,15 +25,15 @@ module RSpec::Rails
 
     private
 
-    def _controller_path
+    def _controller_path(example)
       example.example_group.described_class.to_s.sub(/Helper/,'').underscore
     end
 
     included do
       metadata[:type] = :helper
 
-      before do
-        controller.controller_path = _controller_path
+      before do |example|
+        controller.controller_path = _controller_path(example)
       end
     end
   end

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

@@ -102,10 +102,6 @@ module RSpec::Rails
 
     private
 
-      def _default_file_to_render
-        example.example_group.top_level_description
-      end
-
       def _default_render_options
         if ::Rails::VERSION::STRING >= '3.2'
           # pluck the handler, format, and locale out of, eg, posts/index.de.html.haml
@@ -156,13 +152,14 @@ 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 =~ /^_/
       end
+
+      let(:_default_file_to_render) do |example|
+        example.example_group.top_level_description
+      end
     end
   end
 end

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

@@ -1,4 +1,3 @@
-require 'active_support'
 require 'active_support/core_ext/module/aliasing'
 require 'rspec/matchers/built_in/have'
 

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

@@ -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

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
@@ -149,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?)}

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/version.rb

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

data/spec/autotest/rails_rspec2_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+require "autotest/rails_rspec2"
+
+describe Autotest::RailsRspec2 do
+
+  let(:rails_rspec2_autotest) { Autotest::RailsRspec2.new }
+
+  describe 'exceptions' do
+    let(:exceptions_regexp) { rails_rspec2_autotest.exceptions }
+
+    it "matches './log/test.log'" do
+      exceptions_regexp.should match('./log/test.log')
+    end
+
+    it "matches 'log/test.log'" do
+      exceptions_regexp.should match('log/test.log')
+    end
+
+    it "does not match './spec/models/user_spec.rb'" do
+      exceptions_regexp.should_not match('./spec/models/user_spec.rb')
+    end
+
+    it "does not match 'spec/models/user_spec.rb'" do
+      exceptions_regexp.should_not match('spec/models/user_spec.rb')
+    end
+  end
+
+  describe 'mappings' do
+    it 'runs model specs when support files change' do
+      rails_rspec2_autotest.find_order = %w(spec/models/user_spec.rb spec/support/blueprints.rb)
+      rails_rspec2_autotest.test_files_for('spec/support/blueprints.rb').should(
+        include('spec/models/user_spec.rb'))
+    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

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

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/rspec/helper/helper_generator'
+
+describe Rspec::Generators::HelperGenerator 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 }
+
+  subject { file('spec/helpers/posts_helper_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 PostsHelper/) }
+    end
+  end
+  describe 'skipped with a flag' do
+    before do
+      run_generator %w(posts --no-helper_specs)
+    end
+    it { should_not exist }
+  end
+end

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

@@ -0,0 +1,30 @@
+require 'spec_helper'
+require 'generators/rspec/install/install_generator'
+
+describe Rspec::Generators::InstallGenerator do
+  destination File.expand_path("../../../../../tmp", __FILE__)
+
+  before { prepare_destination }
+
+  it "generates .rspec" do
+    run_generator
+    file('.rspec').should exist
+  end
+
+  it "generates spec/spec_helper.rb" do
+    run_generator
+    File.read( file('spec/spec_helper.rb') ).should =~ /^require 'rspec\/autorun'$/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
+    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
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+# Generators are not automatically loaded by Rails
+require 'generators/rspec/integration/integration_generator'
+
+describe Rspec::Generators::IntegrationGenerator 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 'are not generated' do
+    before do
+      run_generator %w(posts --no-request-specs)
+    end
+    describe 'index.html.erb' do
+      subject { file('spec/requests/posts_spec.rb') }
+      it { should_not 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/) }
+    end
+  end
+end