rspec-rails 2.7.0 → 2.8.0.rc1

data/lib/generators/rspec/install/templates/spec/spec_helper.rb

@@ -16,7 +16,6 @@ RSpec.configure do |config|
   # config.mock_with :mocha
   # config.mock_with :flexmock
   # config.mock_with :rr
-  config.mock_with :rspec
 
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"

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

@@ -67,20 +67,19 @@ module Rspec
 
         # support for namespaced-resources
         def ns_file_name
-          if ARGV[0].match(/(\w+)\/(\w+)/)
-            "#{$1.underscore}_#{$2.singularize.underscore}"
-          else
-            file_name
-          end
+          ns_parts.empty? ? file_name : "#{ns_parts[0].underscore}_#{ns_parts[1].singularize.underscore}"
         end
 
         # support for namespaced-resources
         def ns_table_name
-          if ARGV[0].match(/(\w+)\/(\w+)/)
-            "#{$1.underscore}/#{$2.tableize}"
-          else
-            table_name
-          end
+          ns_parts.empty? ? table_name : "#{ns_parts[0].underscore}/#{ns_parts[1].tableize}"
+        end
+
+        def ns_parts
+          @ns_parts ||= begin
+                          matches = ARGV[0].to_s.match(/\A(\w+)\/(\w+)/)
+                          matches ? [matches[1], matches[2]] : []
+                        end
         end
 
         # Returns the name of the mock. For example, if the file name is user,

data/lib/rspec/rails/fixture_support.rb

@@ -29,8 +29,7 @@ module RSpec
 
       RSpec.configure do |c|
         c.include RSpec::Rails::FixtureSupport
-        c.add_setting :use_transactional_fixtures
-        c.add_setting :use_transactional_examples, :alias => :use_transactional_fixtures
+        c.add_setting :use_transactional_fixtures, :alias_with => :use_transactional_examples
         c.add_setting :use_instantiated_fixtures
         c.add_setting :global_fixtures
         c.add_setting :fixture_path

data/lib/rspec/rails/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Rails
     module Version
-      STRING = '2.7.0'
+      STRING = '2.8.0.rc1'
     end
   end
 end

data/lib/rspec/rails/view_rendering.rb

@@ -1,16 +1,24 @@
 require 'action_view/testing/resolvers'
 
 RSpec.configure do |config|
-  config.add_setting :render_views, :default => false
+  # This allows us to expose `render_views` as a config option even though it
+  # breaks the convention of other options by using `render_views` as a
+  # command (i.e. render_views = true), where it would normally be used as a
+  # getter. This makes it easier for rspec-rails users because we use
+  # `render_views` directly in example groups, so this aligns the two APIs,
+  # but requires this workaround:
+  config.add_setting :rendering_views, :default => false
+
+  def config.render_views=(val)
+    self.rendering_views = val
+  end
 
-  # TODO - rspec-core needs a way to define a setting that works like this in
-  # one go
   def config.render_views
-    settings[:render_views] = true
+    self.rendering_views = true
   end
 
   def config.render_views?
-    settings[:render_views]
+    rendering_views
   end
 end
 

data/spec/generators/rspec/scaffold/scaffold_generator_spec.rb

@@ -1,40 +1,36 @@
 require 'spec_helper'
 
-# Generators are not automatically loaded by Rails
 require 'generators/rspec/scaffold/scaffold_generator'
 
 describe Rspec::Generators::ScaffoldGenerator do
-  # Tell the generator where to put its output (what it thinks of as Rails.root)
   destination File.expand_path("../../../../../tmp", __FILE__)
 
   before { prepare_destination }
 
-  describe 'controller specs' do
+  describe 'standard controller spec' do
     subject { file('spec/controllers/posts_controller_spec.rb') }
-    describe 'generated by default' do
-      before do
-        run_generator %w(posts)
-      end
 
-      describe 'the spec' do
-        it { should exist }
-        it { should contain /require 'spec_helper'/ }
-        it { should contain /describe PostsController/ }
-      end
+    describe 'with no options' do
+      before { run_generator %w(posts) }
+      it { should contain /require 'spec_helper'/ }
+      it { should contain /describe PostsController/ }
     end
-    describe 'skipped with a flag' do
-      before do
-        run_generator %w(posts --no-controller_specs)
-      end
+
+    describe 'with --no-controller_specs' do
+      before { run_generator %w(posts --no-controller_specs) }
       it { should_not exist }
     end
   end
 
+  describe 'namespaced controller spec' do
+    subject { file('spec/controllers/admin/posts_controller_spec.rb') }
+    before  { run_generator %w(admin/posts) }
+    it { should contain /describe Admin::PostsController/ }
+  end
+
   describe 'view specs' do
-    describe 'generated by default' do
-      before do
-        run_generator %w(posts)
-      end
+    describe 'with no options' do
+      before { run_generator %w(posts) }
       describe 'edit' do
         subject { file("spec/views/posts/edit.html.erb_spec.rb") }
         it { should exist }
@@ -42,6 +38,7 @@ describe Rspec::Generators::ScaffoldGenerator do
         it { should contain /describe "(.*)\/edit.html.erb"/ }
         it { should contain /it "renders the edit (.*) form"/ }
       end
+
       describe 'index' do
         subject { file("spec/views/posts/index.html.erb_spec.rb") }
         it { should exist }
@@ -49,6 +46,7 @@ describe Rspec::Generators::ScaffoldGenerator do
         it { should contain /describe "(.*)\/index.html.erb"/ }
         it { should contain /it "renders a list of (.*)"/ }
       end
+
       describe 'new' do
         subject { file("spec/views/posts/new.html.erb_spec.rb") }
         it { should exist }
@@ -56,6 +54,7 @@ describe Rspec::Generators::ScaffoldGenerator do
         it { should contain /describe "(.*)\/new.html.erb"/ }
         it { should contain /it "renders new (.*) form"/ }
       end
+
       describe 'show' do
         subject { file("spec/views/posts/show.html.erb_spec.rb") }
         it { should exist }
@@ -65,22 +64,24 @@ describe Rspec::Generators::ScaffoldGenerator do
       end
     end
 
-    describe 'skipped with a flag' do
-      before do
-        run_generator %w(posts --no-view-specs)
-      end
+    describe 'with --no-view-specs' do
+      before { run_generator %w(posts --no-view-specs) }
+
       describe 'edit' do
         subject { file("spec/views/posts/edit.html.erb_spec.rb") }
         it { should_not exist }
       end
+
       describe 'index' do
         subject { file("spec/views/posts/index.html.erb_spec.rb") }
         it { should_not exist }
       end
+
       describe 'new' do
         subject { file("spec/views/posts/new.html.erb_spec.rb") }
         it { should_not exist }
       end
+
       describe 'show' do
         subject { file("spec/views/posts/show.html.erb_spec.rb") }
         it { should_not exist }
@@ -88,26 +89,19 @@ describe Rspec::Generators::ScaffoldGenerator do
     end
   end
 
-  describe 'routing specs' do
+  describe 'routing spec' do
     subject { file('spec/routing/posts_routing_spec.rb') }
-    describe 'generated by default' do
-      before do
-        run_generator %w(posts)
-      end
 
-      describe 'the spec' do
-        it { should exist }
-        it { should contain /require "spec_helper"/ }
-        it { should contain /describe PostsController/ }
-        it { should contain /describe "routing"/ }
-      end
+    describe 'with default options' do
+      before { run_generator %w(posts) }
+      it { should contain /require "spec_helper"/ }
+      it { should contain /describe PostsController/ }
+      it { should contain /describe "routing"/ }
     end
-    describe 'skipped with a flag' do
-      before do
-        run_generator %w(posts --no-routing_specs)
-      end
+
+    describe 'with --no-routing-specs' do
+      before { run_generator %w(posts --no-routing_specs) }
       it { should_not exist }
     end
   end
-
 end

data/spec/rspec/rails/matchers/relation_match_array_spec.rb

@@ -1,6 +1,8 @@
 require "spec_helper"
 
 describe "ActiveSupport::Relation =~ matcher" do
+  before { MockableModel.delete_all }
+  
   let!(:models) { Array.new(3) { MockableModel.create } }
 
   it "verifies that the scope returns the records on the right hand side, regardless of order" do
@@ -9,7 +11,6 @@ describe "ActiveSupport::Relation =~ matcher" do
 
   it "fails if the scope encompasses more records than on the right hand side" do
     another_model = MockableModel.create
-
     MockableModel.scoped.should_not =~ models.reverse
   end
 

data/spec/spec_helper.rb

@@ -16,12 +16,13 @@ class RSpec::Core::ExampleGroup
   end
 end
 
-RSpec.configure do |c|
-  c.before(:each) do
+RSpec.configure do |config|
+  config.before(:each) do
     @real_world = RSpec.world
     RSpec.instance_variable_set(:@world, RSpec::Core::World.new)
   end
-  c.after(:each) do
+  config.after(:each) do
     RSpec.instance_variable_set(:@world, @real_world)
   end
-end
+  config.order = :random
+end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-rails
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: 15424215
+  prerelease: 6
   segments: 
   - 2
-  - 7
+  - 8
   - 0
-  version: 2.7.0
+  - rc
+  - 1
+  version: 2.8.0.rc1
 platform: ruby
 authors: 
 - David Chelimsky
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-16 00:00:00 Z
+date: 2011-11-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -66,14 +68,16 @@ dependencies:
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15424215
         segments: 
         - 2
-        - 7
+        - 8
         - 0
-        version: 2.7.0
+        - rc
+        - 1
+        version: 2.8.0.rc1
   requirement: *id004
   type: :runtime
   prerelease: false
@@ -243,19 +247,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rspec
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.7.0
+summary: rspec-rails-2.8.0.rc1
 test_files: 
 - features/Autotest.md
 - features/Generators.md