dchelimsky-rspec-rails 1.1.99.9 → 1.1.99.13

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

@@ -254,14 +254,14 @@ 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.rhtml", :type => :view do
+describe "view_spec/foo/show", :type => :view do
   context "rendered with no args" do
     it "renders just fine" do
       render

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
@@ -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")
@@ -808,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

data/spec/spec/rails/matchers/render_template_spec.rb

@@ -11,70 +11,77 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
 
       subject { send(subject_method) }
 
-      it "should match a simple path" do
+      it "matches an action (using a string)" do
         post 'some_action'
         should render_template('some_action')
       end
 
-      it "should match a less simple path" do
+      if ::Rails::VERSION::STRING >= '2.3'
+        it "matches an action with specified extenstions" do
+          post 'some_action'
+          should render_template('some_action.html.erb')
+        end
+      end
+
+      it "matches an action (using a symbol)" do
+        post 'some_action'
+        should render_template(:some_action)
+      end
+    
+      it "matches an action on a specific controller" do
         post 'some_action'
         should render_template('render_spec/some_action')
       end
     
-      it "should match a less simple path to another controller" do
+      it "matches an action on a non-default specific controller" do
         post 'action_which_renders_template_from_other_controller'
         should render_template('controller_spec/action_with_template')
       end
     
-      it "should match a symbol" do
-        post 'some_action'
-        should render_template(:some_action)
-      end
-    
-      it "should match an rjs template" do
+      it "matches an rjs template" do
         xhr :post, 'some_action'
         should render_template('render_spec/some_action')
       end
     
-      it "should match a partial template (simple path)" do
+      it "matches a partial template (simple path)" do
         get 'action_with_partial'
         should render_template("_a_partial")
       end
     
-      it "should match a partial template (complex path)" do
+      it "matches a partial template (complex path)" do
         get 'action_with_partial'
         should render_template("render_spec/_a_partial")
       end
     
-      it "should fail when the wrong template is rendered" do
+      it "fails when the wrong template is rendered" do
         post 'some_action'
         lambda do
           should render_template('non_existent_template')
         end.should fail_with(/expected \"non_existent_template\", got \"render_spec\/some_action(\.html\.erb)?\"/)
       end
     
-      it "should fail without full path when template is associated with a different controller" do
+      it "fails when template is associated with a different controller but controller is not specified" do
         post 'action_which_renders_template_from_other_controller'
         lambda do
           should render_template('action_with_template')
-        end.should fail_with(/expected \"action_with_template\", got \"controller_spec\/action_with_template(\.rhtml)?\"/)
+        end.should fail_with(/expected \"action_with_template\", got \"controller_spec\/action_with_template(\.html\.erb)?\"/)
       end
     
-      it "should fail with incorrect full path when template is associated with a different controller" do
+      it "fails with incorrect full path when template is associated with a different controller" do
         post 'action_which_renders_template_from_other_controller'
         lambda do
           should render_template('render_spec/action_with_template')
-        end.should fail_with(/expected \"render_spec\/action_with_template\", got \"controller_spec\/action_with_template(\.rhtml)?\"/)
+        end.should fail_with(/expected \"render_spec\/action_with_template\", got \"controller_spec\/action_with_template(\.html\.erb)?\"/)
       end
     
-      it "should fail on the wrong extension (given rhtml)" do
+      it "fails on the wrong extension" do
         get 'some_action'
         lambda {
-          should render_template('render_spec/some_action.rjs')
-        }.should fail_with(/expected \"render_spec\/some_action\.rjs\", got \"render_spec\/some_action(\.html\.erb)?\"/)
+          should render_template('render_spec/some_action.js.rjs')
+        }.should fail_with(/expected \"render_spec\/some_action\.js\.rjs\", got \"render_spec\/some_action(\.html\.erb)?\"/)
       end
     
-      it "should fail when TEXT is rendered" do
+      it "faild when TEXT is rendered" do
         post 'text_action'
         lambda do
           should render_template('some_action')
@@ -82,10 +89,11 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
       end
     
       describe "with an alternate layout" do
-        controller_name :render_spec
-        it "should say it rendered the action's template" do
-          get 'action_with_alternate_layout'
-          should render_template('action_with_alternate_layout')
+        it "says it rendered the action's layout" do
+          pending("record rendering of layouts") do
+            get 'action_with_alternate_layout'
+            should render_template('layouts/simple')
+          end
         end
       end
       
@@ -103,75 +111,75 @@ require File.dirname(__FILE__) + '/../../../spec_helper'
       
       subject { send(subject_method) }
 
-      it "should pass when the action renders nothing" do
+      it "passes when the action renders nothing" do
         post 'action_that_renders_nothing'
         should_not render_template('action_that_renders_nothing')
       end
       
-      it "should pass when the action renders nothing (symbol)" do
+      it "passes when the action renders nothing (symbol)" do
         post 'action_that_renders_nothing'
         should_not render_template(:action_that_renders_nothing)
       end
       
-      it "should pass when the action does not render the template" do
+      it "passes when the action does not render the template" do
         post 'some_action'
         should_not render_template('some_other_template')
       end
       
-      it "should pass when the action does not render the template (symbol)" do
+      it "passes when the action does not render the template (symbol)" do
         post 'some_action'
         should_not render_template(:some_other_template)
       end
       
-      it "should pass when the action does not render the template (named with controller)" do
+      it "passes when the action does not render the template (named with controller)" do
         post 'some_action'
         should_not render_template('render_spec/some_other_template')
       end
       
-      it "should pass when the action renders the template with a different controller" do
+      it "passes when the action renders the template with a different controller" do
         post 'action_which_renders_template_from_other_controller'
         should_not render_template('action_with_template')
       end
       
-      it "should pass when the action renders the template (named with controller) with a different controller" do
+      it "passes when the action renders the template (named with controller) with a different controller" do
         post 'action_which_renders_template_from_other_controller'
         should_not render_template('render_spec/action_with_template')
       end
       
-      it "should pass when TEXT is rendered" do
+      it "passes when TEXT is rendered" do
         post 'text_action'
         should_not render_template('some_action')
       end
       
-      it "should fail when the action renders the template" do
+      it "fails when the action renders the template" do
         post 'some_action'
         lambda do
           should_not render_template('some_action')
         end.should fail_with("expected not to render \"some_action\", but did")
       end
       
-      it "should fail when the action renders the template (symbol)" do
+      it "fails when the action renders the template (symbol)" do
         post 'some_action'
         lambda do
           should_not render_template(:some_action)
         end.should fail_with("expected not to render \"some_action\", but did")
       end
       
-      it "should fail when the action renders the template (named with controller)" do
+      it "fails when the action renders the template (named with controller)" do
         post 'some_action'
         lambda do
           should_not render_template('render_spec/some_action')
         end.should fail_with("expected not to render \"render_spec/some_action\", but did")
       end
       
-      it "should fail when the action renders the partial" do
+      it "fails when the action renders the partial" do
         post 'action_with_partial'
         lambda do
           should_not render_template('_a_partial')
         end.should fail_with("expected not to render \"_a_partial\", but did")
       end
       
-      it "should fail when the action renders the partial (named with controller)" do
+      it "fails when the action renders the partial (named with controller)" do
         post 'action_with_partial'
         lambda do
           should_not render_template('render_spec/_a_partial')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.99.9
+  version: 1.1.99.13
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-24 00:00:00 -08:00
+date: 2009-03-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.99.9
+        version: 1.1.99.13
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 1.9.0
     version: 
 description: Behaviour Driven Development for Ruby on Rails.
 email: 
@@ -67,6 +67,7 @@ extra_rdoc_files:
 - TODO.txt
 - generators/rspec/templates/previous_failures.txt
 files: 
+- .document
 - History.txt
 - License.txt
 - Manifest.txt
@@ -116,6 +117,7 @@ files:
 - lib/spec/rails/example/helper_example_group.rb
 - lib/spec/rails/example/model_example_group.rb
 - lib/spec/rails/example/render_observer.rb
+- lib/spec/rails/example/routing_example_group.rb
 - lib/spec/rails/example/routing_helpers.rb
 - lib/spec/rails/example/view_example_group.rb
 - lib/spec/rails/extensions.rb
@@ -146,6 +148,7 @@ files:
 - spec/resources/controllers/action_view_base_spec_controller.rb
 - spec/resources/controllers/application.rb
 - spec/resources/controllers/controller_spec_controller.rb
+- spec/resources/controllers/example.txt
 - spec/resources/controllers/redirect_spec_controller.rb
 - spec/resources/controllers/render_spec_controller.rb
 - spec/resources/controllers/rjs_spec_controller.rb
@@ -157,49 +160,48 @@ files:
 - spec/resources/models/animal.rb
 - spec/resources/models/person.rb
 - spec/resources/models/thing.rb
-- spec/resources/views/controller_spec/_partial.rhtml
-- spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml
-- spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml
-- spec/resources/views/controller_spec/action_setting_the_assigns_hash.rhtml
-- spec/resources/views/controller_spec/action_with_errors_in_template.rhtml
-- spec/resources/views/controller_spec/action_with_template.rhtml
-- spec/resources/views/layouts/application.rhtml
-- spec/resources/views/layouts/simple.rhtml
+- spec/resources/views/controller_spec/_partial.html.erb
+- spec/resources/views/controller_spec/action_setting_flash_after_session_reset.html.erb
+- spec/resources/views/controller_spec/action_setting_flash_before_session_reset.html.erb
+- spec/resources/views/controller_spec/action_setting_the_assigns_hash.html.erb
+- spec/resources/views/controller_spec/action_with_errors_in_template.html.erb
+- spec/resources/views/controller_spec/action_with_template.html.erb
+- spec/resources/views/layouts/application.html.erb
+- spec/resources/views/layouts/simple.html.erb
 - spec/resources/views/objects/_object.html.erb
-- spec/resources/views/render_spec/_a_partial.rhtml
-- spec/resources/views/render_spec/action_with_alternate_layout.rhtml
+- spec/resources/views/render_spec/_a_partial.html.erb
+- spec/resources/views/render_spec/action_with_alternate_layout.html.erb
 - spec/resources/views/render_spec/some_action.html.erb
 - spec/resources/views/render_spec/some_action.js.rjs
-- spec/resources/views/render_spec/some_action.rjs
-- spec/resources/views/rjs_spec/_replacement_partial.rhtml
-- spec/resources/views/rjs_spec/hide_div.rjs
-- spec/resources/views/rjs_spec/hide_page_element.rjs
-- spec/resources/views/rjs_spec/insert_html.rjs
-- spec/resources/views/rjs_spec/replace.rjs
-- spec/resources/views/rjs_spec/replace_html.rjs
-- spec/resources/views/rjs_spec/replace_html_with_partial.rjs
-- spec/resources/views/rjs_spec/visual_effect.rjs
-- spec/resources/views/rjs_spec/visual_toggle_effect.rjs
-- spec/resources/views/tag_spec/no_tags.rhtml
-- spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml
-- spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml
-- spec/resources/views/view_spec/_partial.rhtml
-- spec/resources/views/view_spec/_partial_used_twice.rhtml
-- spec/resources/views/view_spec/_partial_with_local_variable.rhtml
-- spec/resources/views/view_spec/_partial_with_sub_partial.rhtml
-- spec/resources/views/view_spec/_spacer.rhtml
-- spec/resources/views/view_spec/accessor.rhtml
-- spec/resources/views/view_spec/block_helper.rhtml
-- spec/resources/views/view_spec/entry_form.rhtml
-- spec/resources/views/view_spec/explicit_helper.rhtml
-- spec/resources/views/view_spec/foo/show.rhtml
-- spec/resources/views/view_spec/implicit_helper.rhtml
-- spec/resources/views/view_spec/multiple_helpers.rhtml
+- spec/resources/views/rjs_spec/_replacement_partial.html.erb
+- spec/resources/views/rjs_spec/hide_div.js.rjs
+- spec/resources/views/rjs_spec/hide_page_element.js.rjs
+- spec/resources/views/rjs_spec/insert_html.js.rjs
+- spec/resources/views/rjs_spec/replace.js.rjs
+- spec/resources/views/rjs_spec/replace_html.js.rjs
+- spec/resources/views/rjs_spec/replace_html_with_partial.js.rjs
+- spec/resources/views/rjs_spec/visual_effect.js.rjs
+- spec/resources/views/rjs_spec/visual_toggle_effect.js.rjs
+- spec/resources/views/tag_spec/no_tags.html.erb
+- spec/resources/views/tag_spec/single_div_with_no_attributes.html.erb
+- spec/resources/views/tag_spec/single_div_with_one_attribute.html.erb
+- spec/resources/views/view_spec/_partial.html.erb
+- spec/resources/views/view_spec/_partial_used_twice.html.erb
+- spec/resources/views/view_spec/_partial_with_local_variable.html.erb
+- spec/resources/views/view_spec/_partial_with_sub_partial.html.erb
+- spec/resources/views/view_spec/_spacer.html.erb
+- spec/resources/views/view_spec/accessor.html.erb
+- spec/resources/views/view_spec/block_helper.html.erb
+- spec/resources/views/view_spec/entry_form.html.erb
+- spec/resources/views/view_spec/explicit_helper.html.erb
+- spec/resources/views/view_spec/foo/show.html.erb
+- spec/resources/views/view_spec/implicit_helper.html.erb
+- spec/resources/views/view_spec/multiple_helpers.html.erb
 - spec/resources/views/view_spec/path_params.html.erb
-- spec/resources/views/view_spec/should_not_receive.rhtml
-- spec/resources/views/view_spec/template_with_partial.rhtml
-- spec/resources/views/view_spec/template_with_partial_using_collection.rhtml
-- spec/resources/views/view_spec/template_with_partial_with_array.rhtml
+- spec/resources/views/view_spec/should_not_receive.html.erb
+- spec/resources/views/view_spec/template_with_partial.html.erb
+- spec/resources/views/view_spec/template_with_partial_using_collection.html.erb
+- spec/resources/views/view_spec/template_with_partial_with_array.html.erb
 - spec/spec/rails/example/assigns_hash_proxy_spec.rb
 - spec/spec/rails/example/configuration_spec.rb
 - spec/spec/rails/example/controller_example_group_spec.rb
@@ -209,7 +211,8 @@ files:
 - spec/spec/rails/example/example_group_factory_spec.rb
 - spec/spec/rails/example/helper_example_group_spec.rb
 - spec/spec/rails/example/model_example_group_spec.rb
-- spec/spec/rails/example/shared_behaviour_spec.rb
+- spec/spec/rails/example/routing_example_group_spec.rb
+- spec/spec/rails/example/shared_routing_example_group_examples.rb
 - spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb
 - spec/spec/rails/example/view_example_group_spec.rb
 - spec/spec/rails/extensions/action_view_base_spec.rb
@@ -257,6 +260,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.1.99.9
+summary: rspec-rails 1.1.99.13
 test_files: []