rspec-rails 2.14.0.rc1 → 2.14.0

data/features/support/env.rb

@@ -0,0 +1,53 @@
+require 'aruba/cucumber'
+
+module ArubaExt
+  def run(cmd)
+    super(cmd =~ /^rspec/ ? "bin/#{cmd}" : cmd)
+  end
+end
+
+World(ArubaExt)
+
+Before do
+  @aruba_timeout_seconds = 30
+end
+
+unless File.directory?('./tmp/example_app')
+  system "rake generate:app generate:stuff"
+end
+
+def aruba_path(file_or_dir)
+  File.expand_path("../../../#{file_or_dir.sub('example_app','aruba')}", __FILE__)
+end
+
+def example_app_path(file_or_dir)
+  File.expand_path("../../../#{file_or_dir}", __FILE__)
+end
+
+def write_symlink(file_or_dir)
+  source = example_app_path(file_or_dir)
+  target = aruba_path(file_or_dir)
+  system "ln -s #{source} #{target}"
+end
+
+def copy(file_or_dir)
+  source = example_app_path(file_or_dir)
+  target = aruba_path(file_or_dir)
+  system "cp -r #{source} #{target}"
+end
+
+Before do
+  steps %Q{
+    Given a directory named "spec"
+  }
+
+  Dir['tmp/example_app/*'].each do |file_or_dir|
+    if !(file_or_dir =~ /spec$/)
+      write_symlink(file_or_dir)
+    end
+  end
+
+  ["spec/spec_helper.rb"].each do |file_or_dir|
+    write_symlink("tmp/example_app/#{file_or_dir}")
+  end
+end

data/features/support/rails_versions.rb

@@ -0,0 +1,4 @@
+Around "@unsupported-on-rails-3-0" do |scenario, block|
+  require 'rails'
+  block.call unless ::Rails.version.to_s.start_with?("3.0")
+end

data/features/view_specs/inferred_controller_path.feature

@@ -0,0 +1,45 @@
+Feature: view spec infers controller path and action
+
+  Scenario: infer controller path
+    Given a file named "spec/views/widgets/new.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "widgets/new" do
+        it "infers the controller path" do
+          expect(controller.request.path_parameters[:controller]).to eq("widgets")
+          expect(controller.controller_path).to eq("widgets")
+        end
+      end
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass
+
+  Scenario: infer action
+    Given a file named "spec/views/widgets/new.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "widgets/new" do
+        it "infers the controller path" do
+          expect(controller.request.path_parameters[:action]).to eq("new")
+        end
+      end
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass
+
+  Scenario: do not infer action in a partial
+    Given a file named "spec/views/widgets/_form.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "widgets/_form" do
+        it "includes a link to new" do
+          expect(controller.request.path_parameters[:action]).to be_nil
+        end
+      end
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass
+

data/features/view_specs/stub_template.feature

@@ -0,0 +1,51 @@
+Feature: stub template
+
+  In order to isolate view specs from the partials rendered by the primary
+  view, rspec-rails (since 2.2) provides the stub_template method.
+
+  Scenario: stub template that does not exist
+    Given a file named "spec/views/gadgets/list.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "gadgets/list" do
+        it "renders the gadget partial for each gadget" do
+          assign(:gadgets, [
+            mock_model(Gadget, :id => 1, :name => "First"),
+            mock_model(Gadget, :id => 2, :name => "Second")
+          ])
+          stub_template "gadgets/_gadget.html.erb" => "<%= gadget.name %><br/>"
+          render
+          expect(rendered).to match /First/
+          expect(rendered).to match /Second/
+        end
+      end
+      """
+
+    And a file named "app/views/gadgets/list.html.erb" with:
+      """
+      <%= render :partial => "gadget", :collection => @gadgets %>
+      """
+    When I run `rspec spec/views/gadgets/list.html.erb_spec.rb`
+    Then the examples should all pass
+
+  Scenario: stub template that exists
+    Given a file named "spec/views/gadgets/edit.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "gadgets/edit" do
+        before(:each) do
+          @gadget = assign(:gadget, stub_model(Gadget))
+        end
+
+        it "renders the form partial" do
+          stub_template "gadgets/_form.html.erb" => "This content"
+          render
+          expect(rendered).to match /This content/
+        end
+      end
+      """
+    When I run `rspec spec/views/gadgets/edit.html.erb_spec.rb`
+    Then the examples should all pass
+

data/features/view_specs/view_spec.feature

@@ -0,0 +1,206 @@
+Feature: view spec
+
+  View specs live in spec/views and render view templates in isolation.
+
+  Scenario: passing spec that renders the described view file
+    Given a file named "spec/views/widgets/index.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "widgets/index" do
+        it "displays all the widgets" do
+          assign(:widgets, [
+            stub_model(Widget, :name => "slicer"),
+            stub_model(Widget, :name => "dicer")
+          ])
+
+          render
+
+          expect(rendered).to match /slicer/
+          expect(rendered).to match /dicer/
+        end
+      end
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass
+
+  Scenario: passing spec with before and nesting
+    Given a file named "spec/views/widgets/index.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "widgets/index" do
+
+        context "with 2 widgets" do
+          before(:each) do
+            assign(:widgets, [
+              stub_model(Widget, :name => "slicer"),
+              stub_model(Widget, :name => "dicer")
+            ])
+          end
+
+          it "displays both widgets" do
+            render
+
+            expect(rendered).to match /slicer/
+            expect(rendered).to match /dicer/
+          end
+        end
+      end
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass
+
+  Scenario: passing spec with explicit template rendering
+    Given a file named "spec/views/widgets/widget.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "rendering the widget template" do
+        it "displays the widget" do
+          assign(:widget, stub_model(Widget, :name => "slicer"))
+
+          render :template => "widgets/widget.html.erb"
+
+          expect(rendered).to match /slicer/
+        end
+      end
+      """
+    And a file named "app/views/widgets/widget.html.erb" with:
+      """
+      <h2><%= @widget.name %></h2>
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass
+
+  Scenario: passing spec with a description that includes the format and handler
+    Given a file named "spec/views/widgets/widget.xml.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "widgets/widget.html.erb" do
+        it "renders the HTML template" do
+          render
+
+          expect(rendered).to match /HTML/
+        end
+      end
+
+      describe "widgets/widget.xml.erb" do
+        it "renders the XML template" do
+          render
+
+          expect(rendered).to match /XML/
+        end
+      end
+      """
+    And a file named "app/views/widgets/widget.html.erb" with:
+      """
+      HTML
+      """
+    And a file named "app/views/widgets/widget.xml.erb" with:
+      """
+      XML
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass
+
+  Scenario: passing spec with rendering of locals in a partial
+    Given a file named "spec/views/widgets/_widget.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "rendering locals in a partial" do
+        it "displays the widget" do
+          widget = stub_model(Widget, :name => "slicer")
+
+          render :partial => "widgets/widget.html.erb", :locals => {:widget => widget}
+
+          expect(rendered).to match /slicer/
+        end
+      end
+      """
+    And a file named "app/views/widgets/_widget.html.erb" with:
+      """
+      <h3><%= widget.name %></h3>
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass
+
+  Scenario: passing spec with rendering of locals in an implicit partial
+    Given a file named "spec/views/widgets/_widget.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "rendering locals in a partial" do
+        it "displays the widget" do
+          widget = stub_model(Widget, :name => "slicer")
+
+          render "widgets/widget", :widget => widget
+
+          expect(rendered).to match /slicer/
+        end
+      end
+      """
+    And a file named "app/views/widgets/_widget.html.erb" with:
+      """
+      <h3><%= widget.name %></h3>
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass
+
+  Scenario: passing spec with rendering of text
+    Given a file named "spec/views/widgets/direct.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "rendering text directly" do
+        it "displays the given text" do
+
+          render :text => "This is directly rendered"
+
+          expect(rendered).to match /directly rendered/
+        end
+      end
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass
+
+  Scenario: passing view spec that stubs a helper method
+    Given a file named "app/views/secrets/index.html.erb" with:
+      """
+      <%- if admin? %>
+        <h1>Secret admin area</h1>
+      <%- end %>
+      """
+    And a file named "spec/views/secrets/index.html.erb_spec.rb" with:
+      """ruby
+      require 'spec_helper'
+
+      describe 'secrets/index' do
+        before do
+          view.stub(:admin?).and_return(true)
+        end
+
+        it 'checks for admin access' do
+          render
+          expect(rendered).to match /Secret admin area/
+        end
+      end
+      """
+    When I run `rspec spec/views/secrets`
+    Then the examples should all pass
+
+  Scenario: request.path_parameters should match Rails by using symbols for keys
+    Given a file named "spec/views/widgets/index.html.erb_spec.rb" with:
+      """ruby
+      require "spec_helper"
+
+      describe "controller.request.path_parameters" do
+        it "matches the Rails environment by using symbols for keys" do
+          [:controller, :action].each { |k| expect(controller.request.path_parameters.keys).to include(k) }
+        end
+      end
+      """
+    When I run `rspec spec/views`
+    Then the examples should all pass

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

@@ -142,11 +142,9 @@ module RSpec::Rails
       end
     end
 
-    def subject
-      controller
-    end
-
     included do
+      subject { controller }
+
       metadata[:type] = :controller
 
       before do

data/lib/rspec/rails/extensions/active_record/base.rb

@@ -10,8 +10,14 @@ module RSpec
           #     ModelClass.should have(:no).records
           #     ModelClass.should have(1).record
           #     ModelClass.should have(n).records
-          def records
-            find(:all)
+          if ::Rails::VERSION::STRING >= '4'
+            def records
+              all.to_a
+            end
+          else
+            def records
+              find(:all)
+            end
           end
           alias :record :records
         end

data/lib/rspec/rails/mocks.rb

@@ -12,8 +12,8 @@ module RSpec
         # Stubs `persisted?` to return false and `id` to return nil
         # @return self
         def as_new_record
-          self.stub(:persisted?) { false }
-          self.stub(:id) { nil }
+          RSpec::Mocks.allow_message(self, :persisted?).and_return(false)
+          RSpec::Mocks.allow_message(self, :id).and_return(nil)
           self
         end
 
@@ -32,8 +32,8 @@ module RSpec
       module ActiveRecordInstanceMethods
         # Stubs `persisted?` to return `false` and `id` to return `nil`.
         def destroy
-          self.stub(:persisted?) { false }
-          self.stub(:id) { nil }
+          RSpec::Mocks.allow_message(self, :persisted?).and_return(false)
+          RSpec::Mocks.allow_message(self, :id).and_return(nil)
         end
 
         # Transforms the key to a method and calls it.
@@ -106,7 +106,7 @@ EOM
           if defined?(ActiveRecord)
             [:save, :update_attributes, :update].each do |key|
               if stubs[key] == false
-                m.errors.stub(:empty? => false)
+                RSpec::Mocks.allow_message(m.errors, :empty?).and_return(false)
               end
             end
           end
@@ -150,8 +150,8 @@ EOM
       module ActiveModelStubExtensions
         # Stubs `persisted` to return false and `id` to return nil
         def as_new_record
-          self.stub(:persisted?)  { false }
-          self.stub(:id)          { nil }
+          RSpec::Mocks.allow_message(self, :persisted?).and_return(false)
+          RSpec::Mocks.allow_message(self, :id).and_return(nil)
           self
         end
 
@@ -220,10 +220,15 @@ EOM
             stubs = stubs.reverse_merge(:persisted? => !!stubs[:id])
           end
           stubs = stubs.reverse_merge(:blank? => false)
-          stubs.each do |k,v|
-            m.__send__("#{k}=", stubs.delete(k)) if m.respond_to?("#{k}=")
+
+          stubs.each do |message, return_value|
+            if m.respond_to?("#{message}=")
+              m.__send__("#{message}=", return_value)
+            else
+              RSpec::Mocks.allow_message(m, message).and_return(return_value)
+            end
           end
-          m.stub(stubs)
+
           yield m if block_given?
         end
       end