rspec-rails 2.0.0.beta.9.1 → 2.0.0.beta.10

data/Rakefile

@@ -25,7 +25,7 @@ begin
     gem.homepage = "http://github.com/rspec/rspec-rails"
     gem.authors = ["David Chelimsky", "Chad Humphries"]
     gem.rubyforge_project = "rspec"
-    gem.add_dependency "rspec", "2.0.0.beta.9" # gem.version
+    gem.add_dependency "rspec", gem.version
     gem.add_dependency "webrat", ">= 0.7.0"
     gem.post_install_message = <<-EOM
 #{"*"*50}

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.9.1
+2.0.0.beta.10

data/features/model_specs/transactional_examples.feature

@@ -72,7 +72,32 @@ Feature: transactional examples
         it "has one after one was created in a previous example" do
           Widget.count.should == 1
         end
+
+        after(:all) { Widget.destroy_all }
       end
       """
     When I run "rspec spec/models/widget_spec.rb"
     Then I should see "3 examples, 0 failures"
+
+  Scenario: run in transactions with fixture
+    Given a file named "spec/models/thing_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe Thing do 
+        fixtures :things
+        it "fixture method defined" do
+          things(:one)
+        end
+      end
+      """
+    Given a file named "spec/fixtures/things.yml" with:
+      """
+      one:
+        name: MyString
+      """
+    When I run "rspec spec/models/thing_spec.rb"
+    Then I should see "1 example, 0 failures"
+
+
+

data/lib/generators/rspec/controller/controller_generator.rb

@@ -17,7 +17,8 @@ module Rspec
       end
 
       def create_view_files
-        return unless options[:views]
+        return if actions.empty?
+        return unless options[:views] 
 
         empty_directory File.join("spec", "views", file_path)
 

data/lib/generators/rspec/install/install_generator.rb

@@ -11,20 +11,14 @@ DESC
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
 
-      def copy_initializer_files
-        inside "config" do
-          empty_directory "initializers", :verbose => false
-
-          inside "initializers" do
-            template "rspec_generator.rb.tt", "rspec_generator.rb"
-          end
-        end
-      end
-
       def copy_spec_files
         directory 'spec'
       end
 
+      def copy_lib_files
+        directory 'lib'
+      end
+
       def copy_autotest_files
         directory 'autotest'
       end

data/lib/{rspec/rails → generators/rspec/install/templates/lib}/tasks/rspec.rake

@@ -66,3 +66,4 @@ namespace :spec do
     ::CodeStatistics::TEST_TYPES << "Request specs" if File.exist?('spec/requests')
   end
 end
+

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

@@ -18,6 +18,8 @@ Rspec.configure do |config|
   # config.mock_with :rr
   config.mock_with :rspec
 
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
   # If you'd prefer not to run each of your examples within a transaction,
   # uncomment the following line.
   # config.use_transactional_examples = false

data/lib/rspec-rails.rb

@@ -3,10 +3,6 @@ module RSpec
     class Railtie < ::Rails::Railtie
       config.generators.integration_tool :rspec
       config.generators.test_framework   :rspec
-
-      rake_tasks do
-        load "rspec/rails/tasks/rspec.rake"
-      end
     end
   end
-end
+end

data/lib/rspec/rails.rb

@@ -4,11 +4,8 @@ require 'rspec/rails/extensions'
 require 'rspec/rails/null_resolver'
 require 'rspec/rails/view_rendering'
 require 'rspec/rails/adapters'
-require 'rspec/rails/transactional_database_support'
 require 'rspec/rails/matchers'
-require 'rspec/rails/example'
+require 'rspec/rails/fixture_support'
 require 'rspec/rails/mocks'
+require 'rspec/rails/example'
 
-RSpec.configure do |c|
-  c.add_option :use_transactional_examples, :type => :boolean, :default => true
-end

data/lib/rspec/rails/adapters.rb

@@ -19,6 +19,9 @@ module RSpec
 
     module TestUnitAssertionAdapter
       extend ActiveSupport::Concern
+      def method_name 
+        @running_example
+      end
 
       include Test::Unit::Assertions
 

data/lib/rspec/rails/configuration.rb

@@ -0,0 +1,8 @@
+module RSpec
+  module Rails
+    module  Configuration
+      attr_accessor :fixture_path ,:global_fixtures 
+    end
+  end
+end
+

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

@@ -1,33 +1,35 @@
 require 'action_controller'
 require 'webrat'
 
-module ControllerExampleGroupBehaviour
-  extend ActiveSupport::Concern
+module RSpec::Rails
+  module ControllerExampleGroup
+    extend ActiveSupport::Concern
 
-  include RSpec::Rails::SetupAndTeardownAdapter
-  include RSpec::Rails::TestUnitAssertionAdapter
-  include ActionController::TestCase::Behavior
-  include RSpec::Rails::ViewRendering
-  include Webrat::Matchers
-  include Webrat::Methods
-  include RSpec::Matchers
+    include RSpec::Rails::SetupAndTeardownAdapter
+    include RSpec::Rails::TestUnitAssertionAdapter
+    include ActionController::TestCase::Behavior
+    include RSpec::Rails::ViewRendering
+    include Webrat::Matchers
+    include Webrat::Methods
+    include RSpec::Matchers
 
-  attr_reader :controller
+    attr_reader :controller
 
-  module ClassMethods
-    def controller_class
-      describes
+    module ClassMethods
+      def controller_class
+        describes
+      end
     end
-  end
 
-  included do
-    before do
-      @routes = ::Rails.application.routes
-      ActionController::Base.allow_forgery_protection = false
+    included do
+      before do
+        @routes = ::Rails.application.routes
+        ActionController::Base.allow_forgery_protection = false
+      end
     end
-  end
 
-  RSpec.configure do |c|
-    c.include self, :example_group => { :file_path => /\bspec\/controllers\// }
+    RSpec.configure do |c|
+      c.include self, :example_group => { :file_path => /\bspec\/controllers\// }
+    end
   end
 end

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

@@ -1,43 +1,44 @@
 require 'webrat'
 require 'rspec/rails/view_assigns'
 
-module HelperExampleGroupBehaviour
-  extend  ActiveSupport::Concern
-
-  include RSpec::Rails::SetupAndTeardownAdapter
-  include RSpec::Rails::TestUnitAssertionAdapter
-  include ActionView::TestCase::Behavior
-  include RSpec::Rails::ViewAssigns
-  include Webrat::Matchers
-
-  module ClassMethods
-    def determine_default_helper_class(ignore)
-      describes
+module RSpec::Rails
+  module HelperExampleGroup
+    extend  ActiveSupport::Concern
+
+    include RSpec::Rails::SetupAndTeardownAdapter
+    include RSpec::Rails::TestUnitAssertionAdapter
+    include ActionView::TestCase::Behavior
+    include RSpec::Rails::ViewAssigns
+    include Webrat::Matchers
+
+    module ClassMethods
+      def determine_default_helper_class(ignore)
+        describes
+      end
     end
-  end
 
-  module InstanceMethods
-    # Returns an instance of ActionView::Base instrumented with this helper and
-    # any of the built-in rails helpers.
-    def helper
-      _view
-    end
+    module InstanceMethods
+      # Returns an instance of ActionView::Base instrumented with this helper and
+      # any of the built-in rails helpers.
+      def helper
+        _view
+      end
 
-  private
+    private
 
-    def _controller_path
-      running_example.example_group.describes.to_s.sub(/Helper/,'').underscore
+      def _controller_path
+        running_example.example_group.describes.to_s.sub(/Helper/,'').underscore
+      end
     end
-  end
 
-  included do
-    before do
-      controller.controller_path = _controller_path
+    included do
+      before do
+        controller.controller_path = _controller_path
+      end
     end
-  end
 
-  RSpec.configure do |c|
-    c.include self, :example_group => { :file_path => /\bspec\/helpers\// }
+    RSpec.configure do |c|
+      c.include self, :example_group => { :file_path => /\bspec\/helpers\// }
+    end
   end
 end
-

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

@@ -1,27 +1,29 @@
 require 'webrat'
 
-module MailerExampleGroupBehaviour
-  extend ActiveSupport::Concern
+module RSpec::Rails
+  module MailerExampleGroup
+    extend ActiveSupport::Concern
 
-  include Webrat::Matchers
-  include RSpec::Matchers
+    include Webrat::Matchers
+    include RSpec::Matchers
 
-  def read_fixture(action)
-    IO.readlines(File.join(Rails.root, 'spec', 'fixtures', self.described_class.name.underscore, action))
-  end
+    def read_fixture(action)
+      IO.readlines(File.join(Rails.root, 'spec', 'fixtures', self.described_class.name.underscore, action))
+    end
 
-  included do
-    before do
-      ActionMailer::Base.delivery_method = :test
-      ActionMailer::Base.perform_deliveries = true
-      ActionMailer::Base.deliveries.clear
-      @expected = Mail.new
-      @expected.content_type ["text", "plain", { "charset" => "utf-8" }]
-      @expected.mime_version = '1.0'
+    included do
+      before do
+        ActionMailer::Base.delivery_method = :test
+        ActionMailer::Base.perform_deliveries = true
+        ActionMailer::Base.deliveries.clear
+        @expected = Mail.new
+        @expected.content_type ["text", "plain", { "charset" => "utf-8" }]
+        @expected.mime_version = '1.0'
+      end
     end
-  end
 
-  RSpec.configure do |c|
-    c.include self, :example_group => { :file_path => /\bspec\/mailers\// }
+    RSpec.configure do |c|
+      c.include self, :example_group => { :file_path => /\bspec\/mailers\// }
+    end
   end
 end

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

@@ -1,35 +1,37 @@
 require 'action_dispatch'
 require 'webrat'
 
-module RequestExampleGroupBehaviour
-  extend ActiveSupport::Concern
+module RSpec::Rails
+  module RequestExampleGroup
+    extend ActiveSupport::Concern
 
-  include ActionDispatch::Integration::Runner
-  include RSpec::Rails::TestUnitAssertionAdapter
-  include ActionDispatch::Assertions
-  include Webrat::Matchers
-  include Webrat::Methods
-  include RSpec::Matchers
+    include ActionDispatch::Integration::Runner
+    include RSpec::Rails::TestUnitAssertionAdapter
+    include ActionDispatch::Assertions
+    include Webrat::Matchers
+    include Webrat::Methods
+    include RSpec::Matchers
 
-  included do
-    before do
-      @router = ::Rails.application.routes
+    included do
+      before do
+        @router = ::Rails.application.routes
+      end
+    end
+    
+    def app
+      ::Rails.application
     end
-  end
-  
-  def app
-    ::Rails.application
-  end
 
-  def last_response
-    response
-  end
+    def last_response
+      response
+    end
 
-  Webrat.configure do |config|
-    config.mode = :rack
-  end
+    Webrat.configure do |config|
+      config.mode = :rack
+    end
 
-  RSpec.configure do |c|
-    c.include self, :example_group => { :file_path => /\bspec\/requests\// }
+    RSpec.configure do |c|
+      c.include self, :example_group => { :file_path => /\bspec\/requests\// }
+    end
   end
 end

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

@@ -1,62 +1,64 @@
 require 'webrat'
 require 'rspec/rails/view_assigns'
 
-module ViewExampleGroupBehaviour
-  extend  ActiveSupport::Concern
-
-  include RSpec::Rails::SetupAndTeardownAdapter
-  include RSpec::Rails::TestUnitAssertionAdapter
-  include ActionView::TestCase::Behavior
-  include RSpec::Rails::ViewAssigns
-  include Webrat::Matchers
-
-  module InstanceMethods
-    def response
-      RSpec.deprecate("response", "rendered")
-      rendered
-    end
+module RSpec::Rails
+  module ViewExampleGroup
+    extend  ActiveSupport::Concern
 
-    # :callseq:
-    #   render 
-    #   render(:template => "widgets/new.html.erb")
-    #   render({:partial => "widgets/widget.html.erb"}, {... locals ...})
-    #   render({:partial => "widgets/widget.html.erb"}, {... locals ...}) do ... end
-    #
-    # Delegates to ActionView::Base#render, so see documentation on that for more
-    # info.
-    #
-    # The only addition is that you can call render with no arguments, and RSpec
-    # will pass the top level description to render:
-    #
-    #   describe "widgets/new.html.erb" do
-    #     it "shows all the widgets" do
-    #       render # => view.render(:file => "widgets/new.html.erb")
-    #       ...
-    #     end
-    #   end
-    def render(options={}, local_assigns={}, &block)
-      options = {:template => _default_file_to_render} if Hash === options and options.empty?
-      super(options, local_assigns, &block)
-    end
+    include RSpec::Rails::SetupAndTeardownAdapter
+    include RSpec::Rails::TestUnitAssertionAdapter
+    include ActionView::TestCase::Behavior
+    include RSpec::Rails::ViewAssigns
+    include Webrat::Matchers
 
-  private
+    module InstanceMethods
+      def response
+        RSpec.deprecate("response", "rendered")
+        rendered
+      end
 
-    def _default_file_to_render
-      running_example.example_group.top_level_description
-    end
+      # :callseq:
+      #   render 
+      #   render(:template => "widgets/new.html.erb")
+      #   render({:partial => "widgets/widget.html.erb"}, {... locals ...})
+      #   render({:partial => "widgets/widget.html.erb"}, {... locals ...}) do ... end
+      #
+      # Delegates to ActionView::Base#render, so see documentation on that for more
+      # info.
+      #
+      # The only addition is that you can call render with no arguments, and RSpec
+      # will pass the top level description to render:
+      #
+      #   describe "widgets/new.html.erb" do
+      #     it "shows all the widgets" do
+      #       render # => view.render(:file => "widgets/new.html.erb")
+      #       ...
+      #     end
+      #   end
+      def render(options={}, local_assigns={}, &block)
+        options = {:template => _default_file_to_render} if Hash === options and options.empty?
+        super(options, local_assigns, &block)
+      end
+
+    private
 
-    def _controller_path
-      _default_file_to_render.split("/")[0..-2].join("/")
+      def _default_file_to_render
+        running_example.example_group.top_level_description
+      end
+
+      def _controller_path
+        _default_file_to_render.split("/")[0..-2].join("/")
+      end
     end
-  end
 
-  included do
-    before do
-      controller.controller_path = _controller_path
+    included do
+      before do
+        controller.controller_path = _controller_path
+      end
     end
-  end
 
-  RSpec.configure do |c|
-    c.include self, :example_group => { :file_path => /\bspec\/views\// }
+    RSpec.configure do |c|
+      c.include self, :example_group => { :file_path => /\bspec\/views\// }
+    end
   end
 end

data/lib/rspec/rails/fixture_support.rb

@@ -0,0 +1,31 @@
+module RSpec
+  module Rails
+    module FixtureSupport
+      extend ActiveSupport::Concern
+
+      include RSpec::Rails::SetupAndTeardownAdapter
+      include RSpec::Rails::TestUnitAssertionAdapter
+
+      included do
+        if RSpec.configuration.use_transactional_fixtures
+          # TODO - figure out how to move this outside the included block
+          include ActiveRecord::TestFixtures 
+
+          self.fixture_path = RSpec.configuration.fixture_path 
+          self.use_transactional_fixtures = RSpec.configuration.use_transactional_fixtures
+          self.use_instantiated_fixtures  = RSpec.configuration.use_instantiated_fixtures
+          fixtures RSpec.configuration.global_fixtures if RSpec.configuration.global_fixtures
+        end 
+      end
+    end
+  end
+end
+
+RSpec.configure do |c|
+  c.include RSpec::Rails::FixtureSupport
+  c.add_setting :use_transactional_fixtures, :default => true
+  c.add_setting :use_transactional_examples, :alias => :use_transactional_fixtures
+  c.add_setting :use_instantiated_fixtures
+  c.add_setting :global_fixtures
+  c.add_setting :fixture_path
+end

data/lib/rspec/rails/matchers.rb

@@ -1,3 +1,5 @@
+require 'rspec/core/deprecation'
+require 'rspec/core/backward_compatibility'
 require 'rspec/matchers'
 
 begin

data/rspec-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "2.0.0.beta.9.1"
+  s.version = "2.0.0.beta.10"
 
   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-05-27}
+  s.date = %q{2010-06-02}
   s.description = %q{RSpec-2 for Rails-3}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.extra_rdoc_files = [
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
      "lib/generators/rspec/helper/templates/helper_spec.rb",
      "lib/generators/rspec/install/install_generator.rb",
      "lib/generators/rspec/install/templates/autotest/discover.rb",
-     "lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt",
+     "lib/generators/rspec/install/templates/lib/tasks/rspec.rake",
      "lib/generators/rspec/install/templates/spec/spec_helper.rb",
      "lib/generators/rspec/integration/integration_generator.rb",
      "lib/generators/rspec/integration/templates/request_spec.rb",
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
      "lib/rspec-rails.rb",
      "lib/rspec/rails.rb",
      "lib/rspec/rails/adapters.rb",
+     "lib/rspec/rails/configuration.rb",
      "lib/rspec/rails/example.rb",
      "lib/rspec/rails/example/controller_example_group.rb",
      "lib/rspec/rails/example/helper_example_group.rb",
@@ -75,6 +76,7 @@ Gem::Specification.new do |s|
      "lib/rspec/rails/example/view_example_group.rb",
      "lib/rspec/rails/extensions.rb",
      "lib/rspec/rails/extensions/active_record/base.rb",
+     "lib/rspec/rails/fixture_support.rb",
      "lib/rspec/rails/matchers.rb",
      "lib/rspec/rails/mocks.rb",
      "lib/rspec/rails/monkey.rb",
@@ -82,8 +84,6 @@ Gem::Specification.new do |s|
      "lib/rspec/rails/monkey/action_view/test_case.rb",
      "lib/rspec/rails/monkey/active_support/notifications/fanout.rb",
      "lib/rspec/rails/null_resolver.rb",
-     "lib/rspec/rails/tasks/rspec.rake",
-     "lib/rspec/rails/transactional_database_support.rb",
      "lib/rspec/rails/version.rb",
      "lib/rspec/rails/view_assigns.rb",
      "lib/rspec/rails/view_rendering.rb",
@@ -101,7 +101,6 @@ Gem::Specification.new do |s|
      "spec/rspec/rails/mocks/ar_classes.rb",
      "spec/rspec/rails/mocks/mock_model_spec.rb",
      "spec/rspec/rails/mocks/stub_model_spec.rb",
-     "spec/rspec/rails/transactional_database_support_spec.rb",
      "spec/spec_helper.rb",
      "spec/support/helpers.rb",
      "specs.watchr",
@@ -111,7 +110,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.9.1!
+  Thank you for installing rspec-rails-2.0.0.beta.10!
 
   This version of rspec-rails only works with 
   versions of rails >= 3.0.0.pre.
@@ -126,7 +125,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-rails-2.0.0.beta.9.1}
+  s.summary = %q{rspec-rails-2.0.0.beta.10}
   s.test_files = [
     "spec/rspec/rails/example/controller_example_group_spec.rb",
      "spec/rspec/rails/example/helper_example_group_spec.rb",
@@ -141,7 +140,6 @@ Gem::Specification.new do |s|
      "spec/rspec/rails/mocks/ar_classes.rb",
      "spec/rspec/rails/mocks/mock_model_spec.rb",
      "spec/rspec/rails/mocks/stub_model_spec.rb",
-     "spec/rspec/rails/transactional_database_support_spec.rb",
      "spec/spec_helper.rb",
      "spec/support/helpers.rb"
   ]
@@ -151,14 +149,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.9"])
+      s.add_runtime_dependency(%q<rspec>, ["= 2.0.0.beta.10"])
       s.add_runtime_dependency(%q<webrat>, [">= 0.7.0"])
     else
-      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.9"])
+      s.add_dependency(%q<rspec>, ["= 2.0.0.beta.10"])
       s.add_dependency(%q<webrat>, [">= 0.7.0"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.9"])
+    s.add_dependency(%q<rspec>, ["= 2.0.0.beta.10"])
     s.add_dependency(%q<webrat>, [">= 0.7.0"])
   end
 end

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

@@ -1,11 +1,13 @@
 require "spec_helper"
 
-describe ControllerExampleGroupBehaviour do
-  it "is included in specs in ./spec/controllers" do
-    stub_metadata(
-      :example_group => {:file_path => "./spec/controllers/whatever_spec.rb:15"}
-    )
-    group = RSpec::Core::ExampleGroup.describe
-    group.included_modules.should include(ControllerExampleGroupBehaviour)
+module RSpec::Rails
+  describe ControllerExampleGroup do
+    it "is included in specs in ./spec/controllers" do
+      stub_metadata(
+        :example_group => {:file_path => "./spec/controllers/whatever_spec.rb:15"}
+      )
+      group = RSpec::Core::ExampleGroup.describe
+      group.included_modules.should include(ControllerExampleGroup)
+    end
   end
 end

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

@@ -1,20 +1,22 @@
 require "spec_helper"
 
-describe HelperExampleGroupBehaviour do
-  it "is included in specs in ./spec/views" do
-    stub_metadata(
-      :example_group => {:file_path => "./spec/helpers/whatever_spec.rb:15"}
-    )
-    group = RSpec::Core::ExampleGroup.describe
-    group.included_modules.should include(HelperExampleGroupBehaviour)
-  end
+module RSpec::Rails
+  describe HelperExampleGroup do
+    it "is included in specs in ./spec/views" do
+      stub_metadata(
+        :example_group => {:file_path => "./spec/helpers/whatever_spec.rb:15"}
+      )
+      group = RSpec::Core::ExampleGroup.describe
+      group.included_modules.should include(HelperExampleGroup)
+    end
 
-  module ::FoosHelper; end
+    module ::FoosHelper; end
 
-  it "provides a controller_path based on the helper module's name" do
-    helper_spec = Object.new
-    helper_spec.extend HelperExampleGroupBehaviour::InstanceMethods
-    helper_spec.stub_chain(:running_example, :example_group, :describes).and_return(FoosHelper)
-    helper_spec.__send__(:_controller_path).should == "foos"
+    it "provides a controller_path based on the helper module's name" do
+      helper_spec = Object.new
+      helper_spec.extend HelperExampleGroup::InstanceMethods
+      helper_spec.stub_chain(:running_example, :example_group, :describes).and_return(FoosHelper)
+      helper_spec.__send__(:_controller_path).should == "foos"
+    end
   end
 end

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

@@ -1,11 +1,13 @@
 require "spec_helper"
 
-describe MailerExampleGroupBehaviour do
-  it "is included in specs in ./spec/mailers" do
-    stub_metadata(
-      :example_group => {:file_path => "./spec/mailers/whatever_spec.rb:15"}
-    )
-    group = RSpec::Core::ExampleGroup.describe
-    group.included_modules.should include(MailerExampleGroupBehaviour)
+module RSpec::Rails
+  describe MailerExampleGroup do
+    it "is included in specs in ./spec/mailers" do
+      stub_metadata(
+        :example_group => {:file_path => "./spec/mailers/whatever_spec.rb:15"}
+      )
+      group = RSpec::Core::ExampleGroup.describe
+      group.included_modules.should include(MailerExampleGroup)
+    end
   end
 end

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

@@ -1,11 +1,13 @@
 require "spec_helper"
 
-describe RequestExampleGroupBehaviour do
-  it "is included in specs in ./spec/requests" do
-    stub_metadata(
-      :example_group => {:file_path => "./spec/requests/whatever_spec.rb:15"}
-    )
-    group = RSpec::Core::ExampleGroup.describe
-    group.included_modules.should include(RequestExampleGroupBehaviour)
+module RSpec::Rails
+  describe RequestExampleGroup do
+    it "is included in specs in ./spec/requests" do
+      stub_metadata(
+        :example_group => {:file_path => "./spec/requests/whatever_spec.rb:15"}
+      )
+      group = RSpec::Core::ExampleGroup.describe
+      group.included_modules.should include(RequestExampleGroup)
+    end
   end
 end

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

@@ -1,74 +1,76 @@
 require "spec_helper"
 
-describe ViewExampleGroupBehaviour do
-  it "is included in specs in ./spec/views" do
-    stub_metadata(
-      :example_group => {:file_path => "./spec/views/whatever_spec.rb:15"}
-    )
-    group = RSpec::Core::ExampleGroup.describe
-    group.included_modules.should include(ViewExampleGroupBehaviour)
-  end
+module RSpec::Rails
+  describe ViewExampleGroup do
+    it "is included in specs in ./spec/views" do
+      stub_metadata(
+        :example_group => {:file_path => "./spec/views/whatever_spec.rb:15"}
+      )
+      group = RSpec::Core::ExampleGroup.describe
+      group.included_modules.should include(ViewExampleGroup)
+    end
 
-  describe "#render" do
-    let(:view_spec) do
-      Class.new do
-        module Local
-          def received
-            @received ||= []
-          end
-          def render(options={}, local_assigns={}, &block)
-            received << [options, local_assigns, block]
+    describe "#render" do
+      let(:view_spec) do
+        Class.new do
+          module Local
+            def received
+              @received ||= []
+            end
+            def render(options={}, local_assigns={}, &block)
+              received << [options, local_assigns, block]
+            end
           end
-        end
-        include Local
-        include ViewExampleGroupBehaviour::InstanceMethods
-      end.new
-    end
+          include Local
+          include ViewExampleGroup::InstanceMethods
+        end.new
+      end
 
-    context "given no input" do
-      it "sends render(:file => (described file)) to the view" do
-        view_spec.stub(:_default_file_to_render) { "widgets/new.html.erb" }
-        view_spec.render
-        view_spec.received.first.should == [{:template => "widgets/new.html.erb"},{}, nil]
+      context "given no input" do
+        it "sends render(:file => (described file)) to the view" do
+          view_spec.stub(:_default_file_to_render) { "widgets/new.html.erb" }
+          view_spec.render
+          view_spec.received.first.should == [{:template => "widgets/new.html.erb"},{}, nil]
+        end
       end
-    end
 
-    context "given a string" do
-      it "sends string as the first arg to render" do
-        view_spec.render('arbitrary/path')
-        view_spec.received.first.should == ["arbitrary/path", {}, nil]
+      context "given a string" do
+        it "sends string as the first arg to render" do
+          view_spec.render('arbitrary/path')
+          view_spec.received.first.should == ["arbitrary/path", {}, nil]
+        end
       end
-    end
 
-    context "given a hash" do
-      it "sends the hash as the first arg to render" do
-        view_spec.render(:foo => 'bar')
-        view_spec.received.first.should == [{:foo => "bar"}, {}, nil]
+      context "given a hash" do
+        it "sends the hash as the first arg to render" do
+          view_spec.render(:foo => 'bar')
+          view_spec.received.first.should == [{:foo => "bar"}, {}, nil]
+        end
       end
     end
-  end
 
-  describe "#_controller_path" do
-    let(:view_spec) do
-      Class.new do
-        include ViewExampleGroupBehaviour::InstanceMethods
-      end.new
-    end
-    context "with a common _default_file_to_render" do
-      it "it returns the directory" do
-        view_spec.stub(:_default_file_to_render).
-          and_return("things/new.html.erb")
-        view_spec.__send__(:_controller_path).
-          should == "things"
+    describe "#_controller_path" do
+      let(:view_spec) do
+        Class.new do
+          include ViewExampleGroup::InstanceMethods
+        end.new
+      end
+      context "with a common _default_file_to_render" do
+        it "it returns the directory" do
+          view_spec.stub(:_default_file_to_render).
+            and_return("things/new.html.erb")
+          view_spec.__send__(:_controller_path).
+            should == "things"
+        end
       end
-    end
 
-    context "with a nested _default_file_to_render" do
-      it "it returns the directory path" do
-        view_spec.stub(:_default_file_to_render).
-          and_return("admin/things/new.html.erb")
-        view_spec.__send__(:_controller_path).
-          should == "admin/things"
+      context "with a nested _default_file_to_render" do
+        it "it returns the directory path" do
+          view_spec.stub(:_default_file_to_render).
+            and_return("admin/things/new.html.erb")
+          view_spec.__send__(:_controller_path).
+            should == "admin/things"
+        end
       end
     end
   end

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

@@ -1,68 +1,69 @@
 require "spec_helper"
 
-describe RSpec::Rails::ViewRendering do
-  it "doesn't render views by default" do
-    rendering_views = nil
-    group = RSpec::Core::ExampleGroup.describe do
-      include ControllerExampleGroupBehaviour
-      rendering_views = render_views?
-      it("does something") {}
-    end
-    group.run(double.as_null_object)
-    rendering_views.should be_false
-  end
-
-  it "doesn't render views by default in a nested group" do
-    rendering_views = nil
-    group = RSpec::Core::ExampleGroup.describe do
-      include ControllerExampleGroupBehaviour
-      describe "nested" do
+module RSpec::Rails
+  describe ViewRendering do
+    it "doesn't render views by default" do
+      rendering_views = nil
+      group = RSpec::Core::ExampleGroup.describe do
+        include ControllerExampleGroup
         rendering_views = render_views?
         it("does something") {}
       end
+      group.run(double.as_null_object)
+      rendering_views.should be_false
     end
-    group.run(double.as_null_object)
-    rendering_views.should be_false
-  end
 
-  it "renders views if told to" do
-    rendering_views = false
-    group = RSpec::Core::ExampleGroup.describe do
-      include ControllerExampleGroupBehaviour
-      render_views
-      rendering_views = render_views?
-      it("does something") {}
+    it "doesn't render views by default in a nested group" do
+      rendering_views = nil
+      group = RSpec::Core::ExampleGroup.describe do
+        include ControllerExampleGroup
+        describe "nested" do
+          rendering_views = render_views?
+          it("does something") {}
+        end
+      end
+      group.run(double.as_null_object)
+      rendering_views.should be_false
     end
-    group.run(double.as_null_object)
-    rendering_views.should be_true
-  end
 
-  it "renders views if told to in a nested group" do
-    rendering_views = nil
-    group = RSpec::Core::ExampleGroup.describe do
-      include ControllerExampleGroupBehaviour
-      describe "nested" do
+    it "renders views if told to" do
+      rendering_views = false
+      group = RSpec::Core::ExampleGroup.describe do
+        include ControllerExampleGroup
         render_views
         rendering_views = render_views?
         it("does something") {}
       end
+      group.run(double.as_null_object)
+      rendering_views.should be_true
     end
-    group.run(double.as_null_object)
-    rendering_views.should be_true
-  end
 
-  it "renders views in a nested group if told to in an outer group" do
-    rendering_views = nil
-    group = RSpec::Core::ExampleGroup.describe do
-      include ControllerExampleGroupBehaviour
-      render_views
-      describe "nested" do
-        rendering_views = render_views?
-        it("does something") {}
+    it "renders views if told to in a nested group" do
+      rendering_views = nil
+      group = RSpec::Core::ExampleGroup.describe do
+        include ControllerExampleGroup
+        describe "nested" do
+          render_views
+          rendering_views = render_views?
+          it("does something") {}
+        end
       end
+      group.run(double.as_null_object)
+      rendering_views.should be_true
+    end
+
+    it "renders views in a nested group if told to in an outer group" do
+      rendering_views = nil
+      group = RSpec::Core::ExampleGroup.describe do
+        include ControllerExampleGroup
+        render_views
+        describe "nested" do
+          rendering_views = render_views?
+          it("does something") {}
+        end
+      end
+      group.run(double.as_null_object)
+      rendering_views.should be_true
     end
-    group.run(double.as_null_object)
-    rendering_views.should be_true
   end
 end
-

metadata

@@ -7,9 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 9
-  - 1
-  version: 2.0.0.beta.9.1
+  - 10
+  version: 2.0.0.beta.10
 platform: ruby
 authors: 
 - David Chelimsky
@@ -18,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-27 00:00:00 -05:00
+date: 2010-06-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 9
-        version: 2.0.0.beta.9
+        - 10
+        version: 2.0.0.beta.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -87,7 +86,7 @@ files:
 - lib/generators/rspec/helper/templates/helper_spec.rb
 - lib/generators/rspec/install/install_generator.rb
 - lib/generators/rspec/install/templates/autotest/discover.rb
-- lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt
+- lib/generators/rspec/install/templates/lib/tasks/rspec.rake
 - lib/generators/rspec/install/templates/spec/spec_helper.rb
 - lib/generators/rspec/integration/integration_generator.rb
 - lib/generators/rspec/integration/templates/request_spec.rb
@@ -111,6 +110,7 @@ files:
 - lib/rspec-rails.rb
 - lib/rspec/rails.rb
 - lib/rspec/rails/adapters.rb
+- lib/rspec/rails/configuration.rb
 - lib/rspec/rails/example.rb
 - lib/rspec/rails/example/controller_example_group.rb
 - lib/rspec/rails/example/helper_example_group.rb
@@ -119,6 +119,7 @@ files:
 - lib/rspec/rails/example/view_example_group.rb
 - lib/rspec/rails/extensions.rb
 - lib/rspec/rails/extensions/active_record/base.rb
+- lib/rspec/rails/fixture_support.rb
 - lib/rspec/rails/matchers.rb
 - lib/rspec/rails/mocks.rb
 - lib/rspec/rails/monkey.rb
@@ -126,8 +127,6 @@ files:
 - lib/rspec/rails/monkey/action_view/test_case.rb
 - lib/rspec/rails/monkey/active_support/notifications/fanout.rb
 - lib/rspec/rails/null_resolver.rb
-- lib/rspec/rails/tasks/rspec.rake
-- lib/rspec/rails/transactional_database_support.rb
 - lib/rspec/rails/version.rb
 - lib/rspec/rails/view_assigns.rb
 - lib/rspec/rails/view_rendering.rb
@@ -145,7 +144,6 @@ files:
 - spec/rspec/rails/mocks/ar_classes.rb
 - spec/rspec/rails/mocks/mock_model_spec.rb
 - spec/rspec/rails/mocks/stub_model_spec.rb
-- spec/rspec/rails/transactional_database_support_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - specs.watchr
@@ -158,7 +156,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-rails-2.0.0.beta.9.1!
+    Thank you for installing rspec-rails-2.0.0.beta.10!
   
     This version of rspec-rails only works with 
     versions of rails >= 3.0.0.pre.
@@ -195,7 +193,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-rails-2.0.0.beta.9.1
+summary: rspec-rails-2.0.0.beta.10
 test_files: 
 - spec/rspec/rails/example/controller_example_group_spec.rb
 - spec/rspec/rails/example/helper_example_group_spec.rb
@@ -210,6 +208,5 @@ test_files:
 - spec/rspec/rails/mocks/ar_classes.rb
 - spec/rspec/rails/mocks/mock_model_spec.rb
 - spec/rspec/rails/mocks/stub_model_spec.rb
-- spec/rspec/rails/transactional_database_support_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb

data/lib/generators/rspec/install/templates/config/initializers/rspec_generator.rb.tt

@@ -1,6 +0,0 @@
-<%= app_name %>.configure do
-  config.generators do |g|
-    g.integration_tool :rspec
-    g.test_framework   :rspec
-  end
-end

data/lib/rspec/rails/transactional_database_support.rb

@@ -1,40 +0,0 @@
-module RSpec
-  module Rails
-    module TransactionalDatabaseSupport
-
-      def active_record_configured?
-        defined?(::ActiveRecord) && !::ActiveRecord::Base.configurations.blank?
-      end
-
-      def use_transactional_examples?
-        active_record_configured? && RSpec.configuration.use_transactional_examples?
-      end
-
-      def setup_transactional_examples
-        return unless use_transactional_examples?
-
-        ::ActiveRecord::Base.connection.increment_open_transactions
-        ::ActiveRecord::Base.connection.begin_db_transaction
-      end
-
-      def teardown_transactional_examples
-        return unless use_transactional_examples?
-
-        if ::ActiveRecord::Base.connection.open_transactions != 0
-          ::ActiveRecord::Base.connection.rollback_db_transaction
-          ::ActiveRecord::Base.connection.decrement_open_transactions
-        end
-
-        ::ActiveRecord::Base.clear_active_connections!
-      end
-
-    end
-  end
-end
-
-RSpec.configure do |c|
-  c.include RSpec::Rails::TransactionalDatabaseSupport
-  c.before { setup_transactional_examples }
-  c.after  { teardown_transactional_examples }
-end
-

data/spec/rspec/rails/transactional_database_support_spec.rb

@@ -1,54 +0,0 @@
-require 'spec_helper'
-
-describe RSpec::Rails::TransactionalDatabaseSupport do
-
-  let(:connection) { double('connection', :open_transactions => 1) }
-  let(:test_bed) do
-    Class.new do
-      include RSpec::Rails::TransactionalDatabaseSupport
-      def active_record_configured?; true; end
-    end.new
-  end
-
-  before { ::ActiveRecord::Base.stub(:connection) { connection } }
-
-  describe "#setup_transactional_examples" do
-    context 'when running with examples with transactions' do
-      it "opens a new transaction" do
-        test_bed.stub(:use_transactional_examples?) { true }
-        connection.should_receive(:increment_open_transactions)
-        connection.should_receive(:begin_db_transaction)
-        test_bed.setup_transactional_examples
-      end
-    end
-
-    context 'with transactionless examples' do
-      it "doesn't open a transaction" do
-        test_bed.stub(:use_transactional_examples?) { false }
-        connection.should_not_receive(:increment_open_transactions)
-        connection.should_not_receive(:begin_db_transaction)
-        test_bed.setup_transactional_examples
-      end
-    end
-  end
-
-  describe "#teardown_transactional_examples" do
-    context 'when running with examples with transactions' do
-      it "opens a new transaction" do
-        test_bed.stub(:use_transactional_examples?) { true }
-        connection.should_receive(:rollback_db_transaction)
-        connection.should_receive(:decrement_open_transactions)
-        test_bed.teardown_transactional_examples
-      end
-    end
-
-    context 'with transactionless examples' do
-      it "doesn't close an open transaction" do
-        test_bed.stub(:use_transactional_examples?) { false }
-        connection.should_not_receive(:decrement_open_transactions)
-        connection.should_not_receive(:rollback_db_transaction)
-        test_bed.teardown_transactional_examples
-      end
-    end
-  end
-end