rspec-rails 2.0.0.beta.1 → 2.0.0.beta.2

data/Rakefile

@@ -48,15 +48,15 @@ namespace :generate do
     else
       puts <<-MESSAGE
 
-  You need to install rails in ./tmp/rails before you can run the 
-  #{t.name} task:
-    
-    git clone git://github.com/rails/rails tmp/rails
+You need to install rails in ./tmp/rails before you can run the 
+#{t.name} task:
+  
+  git clone git://github.com/rails/rails tmp/rails
 
-  (We'll automate this eventually, but running 'git clone' from rake in this
-  project is mysteriously full of fail)
+(We'll automate this eventually, but running 'git clone' from rake in this
+project is mysteriously full of fail)
 
-  MESSAGE
+MESSAGE
     end
   end
 

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.1
+2.0.0.beta.2

data/lib/generators/rspec/scaffold/templates/edit_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
-  include <%= controller_class_name %>Helper
-
   before(:each) do
     assign(:<%= file_name %>, @<%= file_name %> = stub_model(<%= class_name %>,
       :new_record? => false<%= output_attributes.empty? ? '' : ',' %>

data/lib/generators/rspec/scaffold/templates/index_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= table_name %>/index.html.<%= options[:template_engine] %>" do
-  include <%= controller_class_name %>Helper
-
   before(:each) do
     assign(:<%= table_name %>, [
 <% [1,2].each_with_index do |id, model_index| -%>

data/lib/generators/rspec/scaffold/templates/new_spec.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= table_name %>/new.html.<%= options[:template_engine] %>" do
-  include <%= controller_class_name %>Helper
-
   before(:each) do
     assign(:<%= file_name %>, stub_model(<%= class_name %>,
       :new_record? => true<%= output_attributes.empty? ? '' : ',' %>

data/lib/generators/rspec/scaffold/templates/show_spec.rb

@@ -2,7 +2,6 @@ require 'spec_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= table_name %>/show.html.<%= options[:template_engine] %>" do
-  include <%= controller_class_name %>Helper
   before(:each) do
     assign(:<%= file_name %>, @<%= file_name %> = stub_model(<%= class_name %><%= output_attributes.empty? ? ')' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>

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

@@ -15,7 +15,7 @@ module ControllerExampleGroupBehaviour
   end
 
   def app 
-    self.class.described_class.action(@_action).tap do |endpoint|
+    described_class.action(@_action).tap do |endpoint|
       def endpoint.routes
         Rails.application.routes
       end

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

@@ -11,12 +11,12 @@ module RequestExampleGroupBehaviour
   def self.included(mod)
     mod.before do
       @_result = Struct.new(:add_assertion).new
-      @router = Rails.application.routes
+      @router = ::Rails.application.routes
     end
   end
   
   def app
-    Rails.application
+    ::Rails.application
   end
 
   Webrat.configure do |config|

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

@@ -8,14 +8,10 @@ module ViewExampleGroupBehaviour
     attr_accessor :controller_path
   end
 
-  module ViewExtensions
-    def protect_against_forgery?; end
-  end
-
   def view
     @view ||= begin
                 view = ActionView::Base.new(ActionController::Base.view_paths, assigns, controller)
-                view.extend ViewExtensions
+                view.extend(Module.new { def protect_against_forgery?; end })
                 view
               end
   end
@@ -33,7 +29,7 @@ module ViewExampleGroupBehaviour
   end
 
   def file_to_render
-    running_example.metadata[:example_group][:description]
+    running_example.example_group.description
   end
 
   def controller_path

data/lib/rspec/rails/matchers.rb

@@ -1,5 +1,16 @@
 require 'rspec/matchers'
-require 'test/unit/assertionfailederror'
+
+#try to fix load error for ruby1.9.1
+begin
+  require 'test/unit/assertionfailederror'
+rescue LoadError
+  module Test
+    module Unit
+      class AssertionFailedError < StandardError
+      end
+    end
+  end
+end
 
 module Rspec
   module Rails

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 1
-  version: 2.0.0.beta.1
+  - 2
+  version: 2.0.0.beta.2
 platform: ruby
 authors: 
 - David Chelimsky
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -06:00
+date: 2010-03-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 1
-        version: 2.0.0.beta.1
+        - 2
+        version: 2.0.0.beta.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -114,7 +114,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.1!
+    Thank you for installing rspec-rails-2.0.0.beta.2!
   
     This version of rspec-rails only works with 
     versions of rails >= 3.0.0.pre.
@@ -151,6 +151,6 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.1
+summary: rspec-rails-2.0.0.beta.2
 test_files: []