rspec-rails 2.11.4 → 2.12.0

data/features/routing_specs/named_routes.feature

@@ -4,13 +4,13 @@ Feature: named routes
 
   Scenario: access named route
     Given a file named "spec/routing/widget_routes_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "routes to the widgets controller" do
         it "routes a named route" do
-          {:get => new_widget_path}.
-            should route_to(:controller => "widgets", :action => "new")
+          expect(:get => new_widget_path).
+            to route_to(:controller => "widgets", :action => "new")
         end
       end
       """

data/features/routing_specs/route_to_matcher.feature

@@ -4,21 +4,21 @@ Feature: route_to matcher
   It is most valuable when specifying routes other than standard RESTful
   routes.
 
-      get("/").should route_to("welcome#index") # new in 2.6.0
+      expect(get("/")).to route_to("welcome#index") # new in 2.6.0
 
       or
 
-      { :get => "/" }.should route_to(:controller => "welcome")
+      expect(:get => "/").to route_to(:controller => "welcome")
 
   Scenario: passing route spec with shortcut syntax
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "routes for Widgets" do
         it "routes /widgets to the widgets controller" do
-          get("/widgets").
-            should route_to("widgets#index")
+          expect(get("/widgets")).
+            to route_to("widgets#index")
         end
       end
       """
@@ -28,13 +28,13 @@ Feature: route_to matcher
 
   Scenario: passing route spec with verbose syntax
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "routes for Widgets" do
         it "routes /widgets to the widgets controller" do
-          { :get => "/widgets" }.
-            should route_to(:controller => "widgets", :action => "index")
+          expect(:get => "/widgets").
+            to route_to(:controller => "widgets", :action => "index")
         end
       end
       """
@@ -44,12 +44,12 @@ Feature: route_to matcher
 
   Scenario: route spec for a route that doesn't exist (fails)
     Given a file named "spec/routing/widgets_routing_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "routes for Widgets" do
         it "routes /widgets/foo to the /foo action" do
-          get("/widgets/foo").should route_to("widgets#foo")
+          expect(get("/widgets/foo")).to route_to("widgets#foo")
         end
       end
       """
@@ -59,13 +59,13 @@ Feature: route_to matcher
 
   Scenario: route spec for a namespaced route with shortcut specifier
     Given a file named "spec/routing/admin_routing_spec.rb" with:
-      """
+      """ruby
       require "spec_helper"
 
       describe "routes for Widgets" do
         it "routes /admin/accounts to the admin/accounts controller" do
-          get("/admin/accounts").
-            should route_to("admin/accounts#index")
+          expect(get("/admin/accounts")).
+            to route_to("admin/accounts#index")
         end
       end
       """
@@ -75,16 +75,16 @@ Feature: route_to matcher
 
   Scenario: route spec for a namespaced route with verbose specifier
    Given a file named "spec/routing/admin_routing_spec.rb" with:
-     """
+     """ruby
      require "spec_helper"
 
      describe "routes for Widgets" do
        it "routes /admin/accounts to the admin/accounts controller" do
-         get("/admin/accounts").
-           should route_to(:controller => "admin/accounts", :action => "index")
+         expect(get("/admin/accounts")).
+           to route_to(:controller => "admin/accounts", :action => "index")
        end
      end
      """
 
    When I run `rspec spec/routing/admin_routing_spec.rb`
-   Then the examples should all pass
+   Then the examples should all pass

data/features/view_specs/inferred_controller_path.feature

@@ -2,12 +2,13 @@ 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
-          controller.request.path_parameters[:controller].should eq("widgets")
+          expect(controller.request.path_parameters[:controller]).to eq("widgets")
+          expect(controller.controller_path).to eq("widgets")
         end
       end
       """
@@ -16,12 +17,12 @@ Feature: view spec infers controller path and action
 
   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
-          controller.request.path_parameters[:action].should eq("new")
+          expect(controller.request.path_parameters[:action]).to eq("new")
         end
       end
       """
@@ -30,12 +31,12 @@ Feature: view spec infers controller path and action
 
   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
-          controller.request.path_parameters[:action].should be_nil
+          expect(controller.request.path_parameters[:action]).to be_nil
         end
       end
       """

data/features/view_specs/stub_template.feature

@@ -5,7 +5,7 @@ Feature: stub template
 
   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
@@ -16,8 +16,8 @@ Feature: stub template
           ])
           stub_template "gadgets/_gadget.html.erb" => "<%= gadget.name %><br/>"
           render
-          rendered.should =~ /First/
-          rendered.should =~ /Second/
+          expect(rendered).to match /First/
+          expect(rendered).to match /Second/
         end
       end
       """
@@ -31,7 +31,7 @@ Feature: stub template
 
   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
@@ -42,7 +42,7 @@ Feature: stub template
         it "renders the form partial" do
           stub_template "gadgets/_form.html.erb" => "This content"
           render
-          rendered.should =~ /This content/
+          expect(rendered).to match /This content/
         end
       end
       """

data/features/view_specs/view_spec.feature

@@ -4,7 +4,7 @@ Feature: view spec
 
   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
@@ -16,8 +16,8 @@ Feature: view spec
 
           render
 
-          rendered.should =~ /slicer/
-          rendered.should =~ /dicer/
+          expect(rendered).to match /slicer/
+          expect(rendered).to match /dicer/
         end
       end
       """
@@ -26,7 +26,7 @@ Feature: view spec
 
   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
@@ -42,8 +42,8 @@ Feature: view spec
           it "displays both widgets" do
             render
 
-            rendered.should =~ /slicer/
-            rendered.should =~ /dicer/
+            expect(rendered).to match /slicer/
+            expect(rendered).to match /dicer/
           end
         end
       end
@@ -53,7 +53,7 @@ Feature: view spec
 
   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
@@ -62,7 +62,7 @@ Feature: view spec
 
           render :template => "widgets/widget.html.erb"
 
-          rendered.should =~ /slicer/
+          expect(rendered).to match /slicer/
         end
       end
       """
@@ -73,9 +73,41 @@ Feature: view spec
     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
@@ -84,7 +116,7 @@ Feature: view spec
 
           render :partial => "widgets/widget.html.erb", :locals => {:widget => widget}
 
-          rendered.should =~ /slicer/
+          expect(rendered).to match /slicer/
         end
       end
       """
@@ -97,7 +129,7 @@ Feature: view spec
 
   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
@@ -106,7 +138,7 @@ Feature: view spec
 
           render "widgets/widget", :widget => widget
 
-          rendered.should =~ /slicer/
+          expect(rendered).to match /slicer/
         end
       end
       """
@@ -119,7 +151,7 @@ Feature: view spec
 
   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
@@ -127,7 +159,7 @@ Feature: view spec
 
           render :text => "This is directly rendered"
 
-          rendered.should =~ /directly rendered/
+          expect(rendered).to match /directly rendered/
         end
       end
       """
@@ -142,7 +174,7 @@ Feature: view spec
       <%- end %>
       """
     And a file named "spec/views/secrets/index.html.erb_spec.rb" with:
-      """
+      """ruby
       require 'spec_helper'
 
       describe 'secrets/index' do
@@ -152,7 +184,7 @@ Feature: view spec
 
         it 'checks for admin access' do
           render
-          rendered.should =~ /Secret admin area/
+          expect(rendered).to match /Secret admin area/
         end
       end
       """
@@ -161,12 +193,12 @@ Feature: view spec
 
   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| controller.request.path_parameters.keys.should include(k) }
+          [:controller, :action].each { |k| expect(controller.request.path_parameters.keys).to include(k) }
         end
       end
       """

data/lib/autotest/rails_rspec2.rb

@@ -33,7 +33,7 @@ class Autotest::RailsRspec2 < Autotest::Rspec2
   end
 
   def setup_rails_rspec2_mappings
-    %w{config/ coverage/ db/ doc/ log/ public/ script/ tmp/ vendor/rails vendor/plugins vendor/gems}.each do |exception|
+    %w{coverage/ db/ doc/ log/ public/ script/ tmp/ vendor/rails vendor/plugins vendor/gems}.each do |exception|
       add_exception(/^([\.\/]*)?#{exception}/)
     end
 

data/lib/generators/rspec.rb

@@ -6,6 +6,12 @@ module Rspec
       def self.source_root
         @_rspec_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'rspec', generator_name, 'templates'))
       end
+
+      if ::Rails.version < '3.1'
+        def module_namespacing
+          yield if block_given?
+        end
+      end
     end
   end
 end

data/lib/generators/rspec/controller/templates/controller_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+<% module_namespacing do -%>
 describe <%= class_name %>Controller do
 
 <% for action in actions -%>
@@ -12,3 +13,4 @@ describe <%= class_name %>Controller do
 
 <% end -%>
 end
+<% end -%>

data/lib/generators/rspec/helper/templates/helper_spec.rb

@@ -10,6 +10,8 @@ require 'spec_helper'
 #     end
 #   end
 # end
+<% module_namespacing do -%>
 describe <%= class_name %>Helper do
   pending "add some examples to (or delete) #{__FILE__}"
 end
+<% end -%>

data/lib/generators/rspec/mailer/templates/mailer_spec.rb

@@ -1,5 +1,6 @@
 require "spec_helper"
 
+<% module_namespacing do -%>
 describe <%= class_name %> do
 <% for action in actions -%>
   describe "<%= action %>" do
@@ -21,3 +22,4 @@ describe <%= class_name %> do
   pending "add some examples to (or delete) #{__FILE__}"
 <% end -%>
 end
+<% end -%>

data/lib/generators/rspec/model/templates/model_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+<% module_namespacing do -%>
 describe <%= class_name %> do
   pending "add some examples to (or delete) #{__FILE__}"
 end
+<% end -%>

data/lib/generators/rspec/observer/templates/observer_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+<% module_namespacing do -%>
 describe <%= class_name %>Observer do
   pending "add some examples to (or delete) #{__FILE__}"
 end
+<% end -%>

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -57,8 +57,42 @@ module Rspec
                    File.join("spec/views", controller_file_path, "#{view}.html.#{options[:template_engine]}_spec.rb")
         end
 
-        def params
-          "{'these' => 'params'}"
+        def example_valid_attributes
+          # Only take the first attribute so this hash does not become unweildy and large in the
+          # generated controller spec. It is the responsibility of the user to keep the the valid
+          # attributes method up-to-date as they add validations.
+          @example_valid_attributes ||=
+            if attributes.any?
+              { attributes.first.name => attributes.first.default.to_s }
+            else
+              { }
+            end
+        end
+
+        def example_invalid_attributes
+          @example_invalid_attributes ||=
+            if attributes.any?
+              { attributes.first.name => "invalid value" }
+            else
+              { }
+            end
+        end
+
+        def example_params_for_update
+          @example_params_for_update ||=
+            if example_valid_attributes.any?
+              example_valid_attributes
+            else
+              { "these" => "params" }
+            end
+        end
+
+        def formatted_hash(hash)
+          formatted = hash.inspect
+          formatted.gsub!("{", "{ ")
+          formatted.gsub!("}", " }")
+          formatted.gsub!("=>", " => ")
+          formatted
         end
 
         # support for namespaced-resources
@@ -73,7 +107,7 @@ module Rspec
 
         def ns_parts
           @ns_parts ||= begin
-                          matches = ARGV[0].to_s.match(/\A(\w+)\/(\w+)/)
+                          matches = ARGV[0].to_s.match(/\A(\w+)(?:\/|::)(\w+)/)
                           matches ? [matches[1], matches[2]] : []
                         end
         end