rspec-rails 2.0.0.beta.15 → 2.0.0.beta.16

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.15
+2.0.0.beta.16

data/features/README.markdown

@@ -0,0 +1,12 @@
+# Cucumber features
+
+RSpec is specified using both RSpec and
+[Cucumber](http://github.com/aslakhellesoy/cucumber). Cucumber provides
+_executable documentation_.  This means that the _.feature_ files below this
+directory serve as specification, documentation _and_ regression tests of the
+behaviour.
+
+## Issues
+
+If you find this documentation incomplete or confusing, please [submit an
+issue](http://github.com/rspec/rspec-rails/issues).

data/features/mailer_specs/url_helpers.feature

@@ -0,0 +1,38 @@
+Feature: URL helpers in mailer examples
+
+  Scenario: using URL helpers with default options
+    Given a file named "config/initializers/mailer_defaults.rb" with:
+      """
+      Rails.configuration.action_mailer.default_url_options = { :host => 'example.com' }
+      """
+    And a file named "spec/mailers/notifications_spec.rb" with:
+      """
+      require 'spec_helper.rb'
+
+      describe Notifications do
+        it 'should have access to URL helpers' do
+          lambda { gadgets_url }.should_not raise_error
+        end
+      end
+      """
+    When I run "rspec spec"
+    Then I should see "1 example, 0 failures"
+
+  Scenario: using URL helpers without default options
+    Given a file named "config/initializers/mailer_defaults.rb" with:
+      """
+      # no default options
+      """
+    And a file named "spec/mailers/notifications_spec.rb" with:
+      """
+      require 'spec_helper.rb'
+
+      describe Notifications do
+        it 'should have access to URL helpers' do
+          lambda { gadgets_url :host => 'example.com' }.should_not raise_error
+          lambda { gadgets_url }.should raise_error
+        end
+      end
+      """
+    When I run "rspec spec"
+    Then I should see "1 example, 0 failures"

data/features/view_specs/view_spec.feature

@@ -16,8 +16,8 @@ Feature: view spec
 
           render
 
-          response.should contain("slicer")
-          response.should contain("dicer")
+          rendered.should contain("slicer")
+          rendered.should contain("dicer")
         end
       end
       """
@@ -42,8 +42,8 @@ Feature: view spec
           it "displays both widgets" do
             render
 
-            response.should contain("slicer")
-            response.should contain("dicer")
+            rendered.should contain("slicer")
+            rendered.should contain("dicer")
           end
         end
       end
@@ -62,7 +62,7 @@ Feature: view spec
 
           render :template => "widgets/widget.html.erb"
 
-          response.should contain("slicer")
+          rendered.should contain("slicer")
         end
       end
       """
@@ -84,7 +84,7 @@ Feature: view spec
 
           render :partial => "widgets/widget.html.erb", :locals => {:widget => widget}
 
-          response.should contain("slicer")
+          rendered.should contain("slicer")
         end
       end
       """
@@ -106,7 +106,7 @@ Feature: view spec
 
           render "widgets/widget", :widget => widget
 
-          response.should contain("slicer")
+          rendered.should contain("slicer")
         end
       end
       """
@@ -127,7 +127,7 @@ Feature: view spec
 
           render :text => "This is directly rendered"
 
-          response.should contain("directly rendered")
+          rendered.should contain("directly rendered")
         end
       end
       """
@@ -146,7 +146,7 @@ Feature: view spec
             page.hide 'status-indicator'
           end
 
-          response.should contain("Element.hide(\"status-indicator\")")
+          rendered.should contain("Element.hide(\"status-indicator\")")
         end
       end
       """

data/lib/generators/rspec/helper/helper_generator.rb

@@ -4,12 +4,12 @@ module Rspec
   module Generators
     class HelperGenerator < Base
       include Rails::Generators::ResourceHelpers
-      class_option :helpers, :type => :boolean, :default => false
+      class_option :helpers, :type => :boolean, :default => true
 
       def create_helper_files
         return unless options[:helpers]
 
-        template 'helper_spec.rb', File.join('spec/helpers', class_path, "#{file_name}_helper_spec.rb")
+        template 'helper_spec.rb', File.join('spec/helpers', class_path, "#{table_name}_helper_spec.rb")
       end
     end
   end

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

@@ -37,7 +37,7 @@ module Rspec
         return unless options[:helper_specs]
 
         template "helper_spec.rb",
-          File.join('spec/helpers', "#{controller_file_name}_helper_spec.rb")
+          File.join('spec/helpers', controller_class_path, "#{controller_file_name}_helper_spec.rb")
 
       end
 
@@ -45,7 +45,7 @@ module Rspec
         return unless options[:routing_specs]
 
         template 'routing_spec.rb',
-          File.join('spec/routing', "#{controller_file_name}_routing_spec.rb")
+          File.join('spec/routing', controller_class_path, "#{controller_file_name}_routing_spec.rb")
       end
 
       hook_for :integration_tool, :as => :integration

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

@@ -1,18 +1,26 @@
-module RSpec::Rails
-  module MailerExampleGroup
-    extend ActiveSupport::Concern
-    extend RSpec::Rails::ModuleInclusion
+if defined?(ActionMailer)
+  module RSpec::Rails
+    module MailerExampleGroup
+      extend ActiveSupport::Concern
+      extend RSpec::Rails::ModuleInclusion
 
-    include ActionMailer::TestCase::Behavior
-    include Webrat::Matchers
-    include RSpec::Matchers
+      include ActionMailer::TestCase::Behavior
+      include Webrat::Matchers
+      include RSpec::Matchers
 
-    module ClassMethods
-      def mailer_class
-        describes
+      included do
+        include ::Rails.application.routes.url_helpers
+        options = ::Rails.configuration.action_mailer.default_url_options
+        options.each { |key, value| default_url_options[key] = value } if options
+      end
+
+      module ClassMethods
+        def mailer_class
+          describes
+        end
       end
-    end
 
-    RSpec.configure &include_self_when_dir_matches('spec','mailers')
+      RSpec.configure &include_self_when_dir_matches('spec','mailers')
+    end
   end
 end

data/lib/rspec/rails/mocks.rb

@@ -132,12 +132,7 @@ module RSpec
         returning model_class.new do |m|
           m.id = stubs.delete(:id)
           m.extend ModelStubber
-          stubs.each do |k,v|
-            if m.has_attribute?(k)
-              m[k] = stubs.delete(k)
-            end
-          end
-          m.stub!(stubs)
+          m.stub(stubs)
           yield m if block_given?
         end
       end

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.15"
+  s.version = "2.0.0.beta.16"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Chelimsky", "Chad Humphries"]
-  s.date = %q{2010-06-30}
+  s.date = %q{2010-07-06}
   s.description = %q{RSpec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -25,9 +25,11 @@ Gem::Specification.new do |s|
      "VERSION",
      "autotest/discover.rb",
      "cucumber.yml",
+     "features/README.markdown",
      "features/controller_specs/isolation_from_views.feature",
      "features/controller_specs/readers.feature",
      "features/controller_specs/render_views.feature",
+     "features/mailer_specs/url_helpers.feature",
      "features/matchers/be_routable_matcher.feature",
      "features/matchers/new_record_matcher.feature",
      "features/model_specs/errors_on.feature",
@@ -119,7 +121,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-rails}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-rails-2.0.0.beta.15!
+  Thank you for installing rspec-rails-2.0.0.beta.16!
 
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
@@ -138,7 +140,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-rails-2.0.0.beta.15}
+  s.summary = %q{rspec-rails-2.0.0.beta.16}
   s.test_files = [
     "spec/rspec/rails/example/controller_example_group_spec.rb",
      "spec/rspec/rails/example/helper_example_group_spec.rb",

data/spec/rspec/rails/example/mailer_example_group_spec.rb

@@ -2,6 +2,13 @@ require "spec_helper"
 
 module RSpec::Rails
   describe MailerExampleGroup do
+
+    module ::Rails; end
+    before do
+      Rails.stub_chain(:application, :routes, :url_helpers).and_return(Rails)
+      Rails.stub_chain(:configuration, :action_mailer, :default_url_options).and_return({})
+    end
+
     it { should be_included_in_files_in('./spec/mailers/') }
     it { should be_included_in_files_in('.\\spec\\mailers\\') }
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 62196477
+  hash: 62196419
   prerelease: true
   segments: 
   - 2
   - 0
   - 0
   - beta
-  - 15
-  version: 2.0.0.beta.15
+  - 16
+  version: 2.0.0.beta.16
 platform: ruby
 authors: 
 - David Chelimsky
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-30 00:00:00 -05:00
+date: 2010-07-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,9 +73,11 @@ files:
 - VERSION
 - autotest/discover.rb
 - cucumber.yml
+- features/README.markdown
 - features/controller_specs/isolation_from_views.feature
 - features/controller_specs/readers.feature
 - features/controller_specs/render_views.feature
+- features/mailer_specs/url_helpers.feature
 - features/matchers/be_routable_matcher.feature
 - features/matchers/new_record_matcher.feature
 - features/model_specs/errors_on.feature
@@ -170,7 +172,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.15!
+    Thank you for installing rspec-rails-2.0.0.beta.16!
   
     This version of rspec-rails only works with 
     versions of rails >= 3.0.0.pre.
@@ -215,7 +217,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.15
+summary: rspec-rails-2.0.0.beta.16
 test_files: 
 - spec/rspec/rails/example/controller_example_group_spec.rb
 - spec/rspec/rails/example/helper_example_group_spec.rb