rspec-rails 1.1.12 → 1.2.0

data/spec/spec/rails/example/example_group_factory_spec.rb

@@ -24,21 +24,21 @@ module Spec
         example_group.superclass.should == Spec::Rails::Example::ModelExampleGroup
       end
 
-      it "should return a RailsExampleGroup when given :spec_path => '/blah/spec/foo/' (anything other than controllers, views and helpers)" do
+      it "should return an ActiveSupport::TestCase when given :spec_path => '/blah/spec/foo/' (anything other than controllers, views and helpers)" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
           "name", :spec_path => '/blah/spec/foo/blah.rb'
         ) {}
-        example_group.superclass.should == Spec::Rails::Example::RailsExampleGroup
+        example_group.superclass.should == ActiveSupport::TestCase
       end
 
-      it "should return a RailsExampleGroup when given :spec_path => '\\blah\\spec\\foo\\' (windows format)  (anything other than controllers, views and helpers)" do
+      it "should return an ActiveSupport::TestCase when given :spec_path => '\\blah\\spec\\foo\\' (windows format)  (anything other than controllers, views and helpers)" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
           "name", :spec_path => '\\blah\\spec\\foo\\blah.rb'
         ) {}
-        example_group.superclass.should == Spec::Rails::Example::RailsExampleGroup
+        example_group.superclass.should == ActiveSupport::TestCase
       end
 
-      it "should return a ViewExampleGroup when given :type => :model" do
+      it "should return a ViewExampleGroup when given :type => :view" do
         example_group = Spec::Example::ExampleGroupFactory.create_example_group(
           "name", :type => :view
         ) {}

data/spec/spec/rails/example/{helper_spec_spec.rb → helper_example_group_spec.rb}

@@ -16,6 +16,8 @@ module Spec
       describe HelperExampleGroup, :type => :helper do
         helper_name :explicit
 
+        accesses_configured_helper_methods
+
         it "DEPRECATED should have direct access to methods defined in helpers" do
           method_in_explicit_helper.should =~ /text from a method/
         end
@@ -112,8 +114,6 @@ module Spec
           ActionView::Helpers::TextHelper,
           ActionView::Helpers::UrlHelper
         ]
-        helpers << ActionView::Helpers::PaginationHelper rescue nil       #removed for 2.0
-        helpers << ActionView::Helpers::JavaScriptMacrosHelper rescue nil #removed for 2.0
         helpers.each do |helper_module|
           it "should include #{helper_module}" do
             self.class.ancestors.should include(helper_module)
@@ -144,21 +144,25 @@ module Spec
         end
       end
       
-      if Rails::VERSION::MAJOR >= 2
-        describe HelperExampleGroup, "using a helper that uses output_buffer inside helper", :type => :helper do
-          helper_name :explicit
-
-          it "should not raise an error" do
-            lambda { method_using_output_buffer }.should_not raise_error
+      describe HelperExampleGroup, "using a helper that uses output_buffer inside helper", :type => :helper do
+        helper_name :explicit
+        
+        before(:each) do
+          if Rails::VERSION::STRING <= "2.1"
+            pending("need to get this new feature working against pre 2.2 versions of rails")
           end
+        end
 
-          it "should put the output in the output_buffer" do
-            method_using_output_buffer
-            output_buffer.should == "the_text_from_concat"
-          end
+        it "should not raise an error" do
+          lambda { method_using_output_buffer }.should_not raise_error
+        end
+
+        it "should put the output in the output_buffer" do
+          method_using_output_buffer
+          output_buffer.should == "the_text_from_concat"
         end
       end
-      
+
       describe HelperExampleGroup, "using a helper that tries to access @template", :type => :helper do
         helper_name :explicit
 
@@ -170,6 +174,7 @@ module Spec
           method_using_template.should have_text(/#some_id/)
         end
       end
+
     end
   end
 end
@@ -199,3 +204,30 @@ module Spec
     end
   end
 end
+
+module Bug719
+  # see http://rspec.lighthouseapp.com/projects/5645/tickets/719
+  # FIXME - helper and example provided in ticket. The example did
+  # fail initially, so running it now shows that the bug is fixed,
+  # but this doesn't serve as a good internal example.
+  module ImagesHelper
+    def hide_images_button
+      content_tag :div, :class => :hide_images_button do
+        button_to_function "Hide Images", :id => :hide_images_button do |page|
+          page[:more_images_button].toggle
+          page[:image_browser].toggle
+        end
+      end
+    end
+  end
+  
+  describe ImagesHelper, :type => :helper do
+    it "should render a hide_images_button" do
+      helper.hide_images_button.should have_tag('div[class=?]','hide_images_button') do
+        with_tag('input[id=?][type=?][value=?][onclick^=?]',
+                 'hide_images_button', 'button', 'Hide Images',
+                 "$(&quot;more_images_button&quot;).toggle();\n$(&quot;image_browser&quot;).toggle();;")
+        end
+     end
+  end
+end

data/spec/spec/rails/example/{model_spec_spec.rb → model_example_group_spec.rb}

@@ -4,7 +4,9 @@ module Spec
   module Rails
     module Example
       describe ModelExampleGroup do
-        it "should clear its name from the description" do
+        accesses_configured_helper_methods
+        
+        it "clears its name from the description" do
           group = describe("foo", :type => :model) do
             $nested_group = describe("bar") do
             end

data/spec/spec/rails/example/routing_example_group_spec.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'controller_spec_controller'
+require File.join(File.dirname(__FILE__), "/shared_routing_example_group_examples.rb")
+
+describe "Routing Examples", :type => :routing do
+  
+  include RoutingExampleGroupSpec
+
+end

data/spec/spec/rails/example/shared_routing_example_group_examples.rb

@@ -0,0 +1,45 @@
+share_as :RoutingExampleGroupSpec do
+
+  class CustomRouteSpecController < ActionController::Base; end
+  class RspecOnRailsSpecsController < ActionController::Base; end
+
+  it "support custom routes" do
+    route_for(:controller => "custom_route_spec", :action => "custom_route").
+      should == "/custom_route"
+  end
+
+  it "support existing routes" do
+    route_for(:controller => "controller_spec", :action => "some_action").
+      should == "/controller_spec/some_action"
+  end
+
+  it "support existing routes with additional parameters" do
+    route_for(:controller => "controller_spec", :action => "some_action", :param => '1').
+      should == "/controller_spec/some_action?param=1"
+  end
+  
+  it "recognize routes with methods besides :get" do
+    route_for(:controller => "rspec_on_rails_specs", :action => "update", :id => "37").
+      should == {:path => "/rspec_on_rails_specs/37", :method => :put}
+  end
+
+  it "generate params for custom routes" do
+    params_from(:get, '/custom_route').
+      should == {:controller => "custom_route_spec", :action => "custom_route"}
+  end
+
+  it "generate params for existing routes" do
+    params_from(:get, '/controller_spec/some_action').
+      should == {:controller => "controller_spec", :action => "some_action"}
+  end
+
+  it "generate params for an existing route with a query parameter" do
+    params_from(:get, '/controller_spec/some_action?param=1').
+      should == {:controller => "controller_spec", :action => "some_action", :param => '1'}
+  end
+
+  it "generate params for an existing route with multiple query parameters" do
+    params_from(:get, '/controller_spec/some_action?param1=1&param2=2').
+      should == {:controller => "controller_spec", :action => "some_action", :param1 => '1', :param2 => '2' }
+  end
+end

data/spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb

@@ -5,7 +5,7 @@ describe "assert_equal", :shared => true do
     assert_equal 1, 1
     lambda {
       assert_equal 1, 2
-    }.should raise_error(Test::Unit::AssertionFailedError)
+    }.should raise_error(::Test::Unit::AssertionFailedError)
   end
 end
 

data/spec/spec/rails/example/{view_spec_spec.rb → view_example_group_spec.rb}

@@ -4,6 +4,8 @@ describe "A template with an implicit helper", :type => :view do
   before(:each) do
     render "view_spec/implicit_helper"
   end
+  
+  accesses_configured_helper_methods
 
   it "should include the helper" do
     response.should have_tag('div', :content => "This is text from a method in the ViewSpecHelper")
@@ -95,7 +97,7 @@ describe "A template that includes a partial", :type => :view do
       template.verify_rendered
     rescue Spec::Mocks::MockExpectationError => e
     ensure
-      e.backtrace.find{|line| line =~ /view_spec_spec\.rb\:92/}.should_not be_nil
+      e.backtrace.find{|line| line =~ /#{__FILE__}\:#{__LINE__ - 6}/}.should_not be_nil
     end
   end
   
@@ -112,7 +114,7 @@ describe "A template that includes a partial", :type => :view do
       template.verify_rendered
     rescue Spec::Mocks::MockExpectationError => e
     ensure
-      e.backtrace.find{|line| line =~ /view_spec_spec\.rb\:109/}.should_not be_nil
+      e.backtrace.find{|line| line =~ /#{__FILE__}\:#{__LINE__ - 6}/}.should_not be_nil
     end
   end
   
@@ -149,18 +151,16 @@ describe "A view that includes a partial using :collection and :spacer_template"
 
 end
 
-if Rails::VERSION::MAJOR >= 2
-  describe "A view that includes a partial using an array as partial_path", :type => :view do
-    before(:each) do
-      renderable_object = Object.new
-      renderable_object.stub!(:name).and_return("Renderable Object")
-      assigns[:array] = [renderable_object]
-    end
+describe "A view that includes a partial using an array as partial_path", :type => :view do
+  before(:each) do
+    renderable_object = Object.new
+    renderable_object.stub!(:name).and_return("Renderable Object")
+    assigns[:array] = [renderable_object]
+  end
 
-    it "should render the array passed through to render_partial without modification" do
-      render "view_spec/template_with_partial_with_array" 
-      response.body.should match(/^Renderable Object$/)
-    end
+  it "should render the array passed through to render_partial without modification" do
+    render "view_spec/template_with_partial_with_array" 
+    response.body.should match(/^Renderable Object$/)
   end
 end
 
@@ -179,6 +179,18 @@ describe "A view", :type => :view do
     render "view_spec/accessor"
   end
 
+  it "should use the template as the implicit subject" do
+    subject.should == template
+  end
+
+  describe "with a specified subject" do
+    subject { 'specified' }
+
+    it "should use the specified subject" do
+      subject.should == 'specified'
+    end
+  end
+
   it "should have access to session data" do
     response.should have_tag("div#session", "session")
   end
@@ -242,13 +254,22 @@ describe "render :inline => ...", :type => :view do
   end
 end
 
-describe "render 'view_spec/foo/show.rhtml'", :type => :view do
+describe "render 'view_spec/foo/show'", :type => :view do
   it "should derive action name using the first part of the template name" do
-    render 'view_spec/foo/show.rhtml'
+    render 'view_spec/foo/show'
     request.path_parameters[:action].should == 'show'
   end
 end
 
+describe "view_spec/foo/show", :type => :view do
+  context "rendered with no args" do
+    it "renders just fine" do
+      render
+      request.path_parameters[:action].should == 'show'
+    end
+  end
+end
+
 describe "setting path parameters", :type => :view do
   describe "(controller)" do
     it "should supercede the default path parameters" do
@@ -270,6 +291,12 @@ describe "setting path parameters", :type => :view do
   end
 end
 
+describe "route helpers", :type => :view do
+  it "should be available before render is called" do
+    custom_route_path.should == '/custom_route'
+  end
+end
+
 module Spec
   module Rails
     module Example
@@ -285,10 +312,10 @@ module Spec
 
         it "should clear ActionView::Base.base_view_path on teardown" do
           group = describe("base_view_path_cleared flag", :type => :view) {}
-          example = group.it{}
+          example = group.new("example",{}) {}
           
           ActionView::Base.should_receive(:base_view_path=).with(nil)
-          group.run_after_each(example)
+          example.run_after_each
         end
       end
     end

data/spec/spec/rails/matchers/ar_be_valid_spec.rb

@@ -13,6 +13,16 @@ describe "be_valid" do
     CanBeValid.new(false).should_not be_valid
   end
 
+  describe CanBeValid do
+    subject { CanBeValid.new(true) }
+    it { subject.should be_valid }
+  end
+
+  describe CanBeValid do
+    subject { CanBeValid.new(false) }
+    it { subject.should_not be_valid }
+  end
+
   class CanHaveErrors
     def initialize(errors)
       @valid = !errors

data/spec/spec/rails/matchers/assert_select_spec.rb

@@ -12,11 +12,6 @@ class AssertSelectController < ActionController::Base
     @content = content
   end
 
-  #NOTE - this is commented because response is implemented in lib/spec/rails/context/controller
-  # def response(&block)
-  #   @update = block
-  # end
-  # 
   def html()
     render :text=>@content, :layout=>false, :content_type=>Mime::HTML
     @content = nil
@@ -212,8 +207,8 @@ describe "should have_tag", :type => :controller do
     response.should have_tag("form[action=test]") { |form|
       with_tag("input[type=text][name=email]")
     }
-    response.should have_tag("form[action=test]") { |form|
-      with_tag("input[type=text][name=email]")
+    response.should have_tag("form[action=other]") { |form|
+      with_tag("input[type=text][name=other_input]")
     }
     
     lambda {
@@ -484,8 +479,7 @@ describe "have_rjs behaviour_type", :type => :controller do
       with_tag("#1")
       with_tag("#2")
       with_tag("#3")
-      # with_tag("#4")
-      # with_tag("#5")
+      with_tag("#4")
     end
   end
 
@@ -678,56 +672,6 @@ describe "send_email behaviour_type", :type => :controller do
 
 end
 
-# describe "An rjs call to :visual_effect, a 'should have_rjs' spec with",
-#   :type => :view do
-#     
-#   before do
-#     render 'rjs_spec/visual_effect'
-#   end
-# 
-#   it "should pass with the correct element name" do
-#     response.should have_rjs(:effect, :fade, 'mydiv')
-#   end
-#   
-#   it "should fail the wrong element name" do
-#     lambda {
-#       response.should have_rjs(:effect, :fade, 'wrongname')
-#     }.should raise_error(SpecFailed)
-#   end
-#   
-#   it "should fail with the correct element but the wrong command" do
-#     lambda {
-#       response.should have_rjs(:effect, :puff, 'mydiv')
-#     }.should raise_error(SpecFailed)
-#   end
-#   
-# end
-#   
-# describe "An rjs call to :visual_effect for a toggle, a 'should have_rjs' spec with",
-#   :type => :view do
-#     
-#   before do
-#     render 'rjs_spec/visual_toggle_effect'
-#   end
-#   
-#   it "should pass with the correct element name" do
-#     response.should have_rjs(:effect, :toggle_blind, 'mydiv')
-#   end
-#   
-#   it "should fail with the wrong element name" do
-#     lambda {
-#       response.should have_rjs(:effect, :toggle_blind, 'wrongname')
-#     }.should raise_error(SpecFailed)
-#   end
-#   
-#   it "should fail the correct element but the wrong command" do
-#     lambda {
-#       response.should have_rjs(:effect, :puff, 'mydiv')
-#     }.should raise_error(SpecFailed)
-#   end
-#   
-# end
-
 describe "string.should have_tag", :type => :helper do
   include AssertSelectSpecHelpers
 
@@ -745,6 +689,10 @@ describe "string.should have_tag", :type => :helper do
     "<div><p>a paragraph</p></div>".should have_tag("p", "a paragraph")
   end
 
+  it "should find nested element in one line" do
+    "<div><p>a paragraph</p></div>".should have_tag("div p","a paragraph")
+  end
+
   it "should find nested element" do
     "<div><p>a paragraph</p></div>".should have_tag("div") do
       with_tag("p", "a paragraph")
@@ -786,6 +734,7 @@ describe "have_tag", :type => :controller do
 end
 
 describe 'selecting in HTML that contains a mock with null_object' do
+  include ActionController::Assertions::SelectorAssertions
   module HTML
     class Document
       def initialize_with_strict_error_checking(text, strict=false, xml=false)
@@ -807,4 +756,54 @@ describe 'selecting in HTML that contains a mock with null_object' do
     html = "<b>#{mock.colour}</b>"
     lambda {html.should have_tag('b')}.should_not raise_error
   end
-end
+end
+
+# describe "An rjs call to :visual_effect, a 'should have_rjs' spec with",
+#   :type => :view do
+#     
+#   before do
+#     render 'rjs_spec/visual_effect'
+#   end
+# 
+#   it "should pass with the correct element name" do
+#     response.should have_rjs(:effect, :fade, 'mydiv')
+#   end
+#   
+#   it "should fail the wrong element name" do
+#     lambda {
+#       response.should have_rjs(:effect, :fade, 'wrongname')
+#     }.should raise_error(SpecFailed)
+#   end
+#   
+#   it "should fail with the correct element but the wrong command" do
+#     lambda {
+#       response.should have_rjs(:effect, :puff, 'mydiv')
+#     }.should raise_error(SpecFailed)
+#   end
+#   
+# end
+#   
+# describe "An rjs call to :visual_effect for a toggle, a 'should have_rjs' spec with",
+#   :type => :view do
+#     
+#   before do
+#     render 'rjs_spec/visual_toggle_effect'
+#   end
+#   
+#   it "should pass with the correct element name" do
+#     response.should have_rjs(:effect, :toggle_blind, 'mydiv')
+#   end
+#   
+#   it "should fail with the wrong element name" do
+#     lambda {
+#       response.should have_rjs(:effect, :toggle_blind, 'wrongname')
+#     }.should raise_error(SpecFailed)
+#   end
+#   
+#   it "should fail the correct element but the wrong command" do
+#     lambda {
+#       response.should have_rjs(:effect, :puff, 'mydiv')
+#     }.should raise_error(SpecFailed)
+#   end
+#   
+# end