dchelimsky-rspec-rails 1.1.8 → 1.1.9

data/History.txt

@@ -1,3 +1,12 @@
+=== Version 1.1.9 / 2008-10-20
+
+* 4 bug fixes
+
+  * require 'rubygems' in script/spec
+	* fix failure message for error_on and errors_on (Patch from Mike Vincent). Fixes #566.
+	* fix issues that arise in view spec if passing actual template name to render (Patch from Mike Vincent). Fixes #551.
+	* fixed bug accessing assigns from helper examples
+
 === Version 1.1.8 / 2008-10-03
 
 * 2 bug fixes
@@ -15,7 +24,7 @@
 
 * 1 bug fix
 
-	* fixed regression where values assigned to the assigns hash were not accessible from the example (#549)
+  * fixed regression where values assigned to the assigns hash were not accessible from the example (#549)
 
 === Version 1.1.5 / 2008-09-28
 

data/License.txt

@@ -0,0 +1,33 @@
+(The MIT License)
+
+====================================================================
+==== RSpec, RSpec-Rails
+Copyright (c) 2005-2008 The RSpec Development Team
+====================================================================
+==== ARTS
+Copyright (c) 2006 Kevin Clark, Jake Howerton
+====================================================================
+==== ZenTest
+Copyright (c) 2001-2006 Ryan Davis, Eric Hodel, Zen Spider Software
+====================================================================
+==== AssertSelect
+Copyright (c) 2006 Assaf Arkin
+====================================================================
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do 
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+SOFTWARE.

data/Manifest.txt

@@ -1,4 +1,5 @@
 History.txt
+License.txt
 Manifest.txt
 README.txt
 Rakefile

data/README.txt

@@ -2,6 +2,7 @@
 
 * http://rspec.info
 * http://rspec.info/rdoc-rails/
+* http://rubyforge.org/projects/rspec
 * http://github.com/dchelimsky/rspec-rails/wikis
 * mailto:rspec-devel@rubyforge.org
 
@@ -43,39 +44,3 @@ expectations you can set on responses and models, etc.
 == INSTALL
 
 * Visit http://github.com/dchelimsky/rspec-rails/wikis for installation instructions.
-
-== LICENSE
-
-(The MIT License)
-
-====================================================================
-==== RSpec, RSpec-Rails
-Copyright (c) 2005-2008 The RSpec Development Team
-====================================================================
-==== ARTS
-Copyright (c) 2006 Kevin Clark, Jake Howerton
-====================================================================
-==== ZenTest
-Copyright (c) 2001-2006 Ryan Davis, Eric Hodel, Zen Spider Software
-====================================================================
-==== AssertSelect
-Copyright (c) 2006 Assaf Arkin
-====================================================================
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of 
-this software and associated documentation files (the "Software"), to deal in 
-the Software without restriction, including without limitation the rights to 
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do 
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all 
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
-SOFTWARE.

data/Rakefile

@@ -15,10 +15,11 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
   p.description = "Behaviour Driven Development for Ruby on Rails."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  p.extra_deps = [["rspec","1.1.8"]]
+  p.extra_deps = [["rspec","1.1.9"]]
+  p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end
 
-['audit','test','test_deps','default','publish_docs','post_blog', 'release'].each do |task|
+['audit','test','test_deps','default','post_blog', 'release'].each do |task|
   Rake.application.instance_variable_get('@tasks').delete(task)
 end
 

data/generators/rspec/templates/script/autospec

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
-ENV['RSPEC'] = 'true'
-system 'autotest'
+ENV['RSPEC'] = 'true'     # allows autotest to discover rspec
+ENV['AUTOTEST'] = 'true'  # allows autotest to run w/ color on linux
+system((RUBY_PLATFORM =~ /mswin|mingw/ ? 'autotest.bat' : 'autotest'), *ARGV) ||
+  $stderr.puts("Unable to find autotest.  Please install ZenTest or fix your PATH")

data/generators/rspec/templates/script/spec

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib"))
+require 'rubygems'
 require 'spec'
 exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT))

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

@@ -125,7 +125,7 @@ module Spec
 
         attr_reader :response, :request, :controller
 
-        def initialize(defined_description, &implementation) #:nodoc:
+        def initialize(defined_description, options={}, &implementation) #:nodoc:
           super
           controller_class_name = self.class.controller_class_name
           if controller_class_name

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

@@ -96,7 +96,11 @@ module Spec
         def helper
           self.class.helper
         end
-
+        
+        def orig_assigns
+          helper.assigns
+        end
+        
         # Reverse the load order so that custom helpers which are defined last
         # are also loaded last.
         ActionView::Base.included_modules.reverse.each do |mod|

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

@@ -32,7 +32,7 @@ module Spec
           ensure_that_base_view_path_is_not_set_across_example_groups
         end
 
-        def initialize(defined_description, &implementation) #:nodoc:
+        def initialize(defined_description, options={}, &implementation) #:nodoc:
           super
           @controller_class_name = "Spec::Rails::Example::ViewExampleGroupController"
         end
@@ -63,7 +63,7 @@ module Spec
 
         def derived_action_name(options) #:nodoc:
           parts = subject_of_render(options).split('/').reject { |part| part.empty? }
-          "#{parts.last}"
+          "#{parts.last}".split('.').first
         end
 
         def subject_of_render(options) #:nodoc:

data/lib/spec/rails/extensions/spec/matchers/have.rb

@@ -5,8 +5,8 @@ module Spec #:nodoc:
     class Have #:nodoc:
       alias_method :__original_failure_message, :failure_message
       def failure_message
-        return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@actual}" if @collection_name == :errors_on
-        return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@actual}" if @collection_name == :error_on
+        return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@given}" if @collection_name == :errors_on
+        return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@given}" if @collection_name == :error_on
         return __original_failure_message
       end
       

data/lib/spec/rails/version.rb

@@ -4,7 +4,7 @@ module Spec
       unless defined? MAJOR
         MAJOR  = 1
         MINOR  = 1
-        TINY   = 8
+        TINY   = 9
 
         STRING = [MAJOR, MINOR, TINY].join('.')
 

data/spec/rails/example/helper_spec_spec.rb

@@ -130,6 +130,19 @@ module Spec
           helper.protect_against_forgery?.should be_false
         end
       end
+      
+      describe HelperExampleGroup, "#assigns", :type => :helper do
+        helper_name :addition
+        it "should expose variables to helper" do
+          assigns[:addend] = 3
+          helper.plus(4).should == 7
+        end
+
+        it "should make helper ivars available in example" do
+          assigns[:addend] = 3
+          assigns[:addend].should == 3
+        end
+      end
     end
   end
 end

data/spec/rails/example/view_spec_spec.rb

@@ -242,6 +242,13 @@ describe "render :inline => ...", :type => :view do
   end
 end
 
+describe "render 'view_spec/foo/show.rhtml'", :type => :view do
+  it "should derive action name using the first part of the template name" do
+    render 'view_spec/foo/show.rhtml'
+    request.path_parameters[:action].should == 'show'
+  end
+end
+
 module Spec
   module Rails
     module Example

data/spec/rails/matchers/errors_on_spec.rb

@@ -1,13 +1,25 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "error_on" do
-  it "should provide a message including the name of what the error is on" do
+  it "should provide a description including the name of what the error is on" do
     have(1).error_on(:whatever).description.should == "should have 1 error on :whatever"
   end
+  
+  it "should provide a failure message including the number actually given" do
+    lambda {
+      [].should have(1).error_on(:whatever)
+    }.should fail_with("expected 1 error on :whatever, got 0")
+  end
 end
 
 describe "errors_on" do
-  it "should provide a message including the name of what the error is on" do
+  it "should provide a description including the name of what the error is on" do
     have(2).errors_on(:whatever).description.should == "should have 2 errors on :whatever"
   end
-end
+  
+  it "should provide a failure message including the number actually given" do
+    lambda {
+      [1].should have(3).errors_on(:whatever)
+    }.should fail_with("expected 3 errors on :whatever, got 1")
+  end
+end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require File.expand_path("#{dir}/../spec_resources/controllers/render_spec_contr
 require File.expand_path("#{dir}/../spec_resources/controllers/rjs_spec_controller")
 require File.expand_path("#{dir}/../spec_resources/controllers/redirect_spec_controller")
 require File.expand_path("#{dir}/../spec_resources/controllers/action_view_base_spec_controller")
+require File.expand_path("#{dir}/../spec_resources/helpers/addition_helper")
 require File.expand_path("#{dir}/../spec_resources/helpers/explicit_helper")
 require File.expand_path("#{dir}/../spec_resources/helpers/more_explicit_helper")
 require File.expand_path("#{dir}/../spec_resources/helpers/view_spec_helper")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-03 00:00:00 -07:00
+date: 2008-10-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.8
+        version: 1.1.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.0
     version: 
 description: Behaviour Driven Development for Ruby on Rails.
 email: 
@@ -39,11 +39,13 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- License.txt
 - Manifest.txt
 - README.txt
 - generators/rspec/templates/previous_failures.txt
 files: 
 - History.txt
+- License.txt
 - Manifest.txt
 - README.txt
 - Rakefile
@@ -227,6 +229,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.1.8
+summary: rspec-rails 1.1.9
 test_files: []