rspec-rails 3.0.0.rc1 → 3.0.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7a33b97b88c1b74c6ff81f48380f86281847892a
-  data.tar.gz: 7621acffba98290f0761567e9818300b5b7686a4
-SHA512:
-  metadata.gz: a3488a19517a4b3ee09cf23bc7da4f2bd14292c4a3f15252aebd621bd8b42a94beecc83212ac95188d1c4b0acaf13c5303b9b917cad0a4aed4fbd768cad92d35
-  data.tar.gz: 97ae5bb4223cd14bcc6357e735db57c08cd5efd2e3e4bf24ee18cae8b712b14fee57bf9cb09bb1b7f98fa31883c9f91d8db3dd34f5d046dd1951b33ca2dc0404
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZWQwZWViNzVjNjdjMDJmODRmM2FlNTIzZmM2YjNkZGEyMjc3YjRjMg==
+  data.tar.gz: !binary |-
+    ODAwMTJlMTc0Zjk1MjhjYzk4YmU4YjBiODBkMTMzOTM0ZjBmZDJkNw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDMwMDMwNmE5ODQzNDVhOGZkZTAyNjhiNTJhYTkzMWE3NGY1MTBlZmU0YjM0
+    MGRiYWI5YjljZTE2MTY3MTU1MTNhMjk5YmU1ZTM0MDcwNmUxZmM3NTFkOWU1
+    YzhjMWVlMDM0YTE5YTcwMTBkMGFmYzI1ZWIxOTFjNzg3YzUxYmM=
+  data.tar.gz: !binary |-
+    OTI1ZmFmYjMwNTA0YWU3NzRjNWFkNjlkNThiYjBmYzI5MDAyYWJiYzA2Y2Y3
+    YTFiYzFiZjg0YWFhNTEyNWZhZDgyYTExMmFkZWE1OWQ0YmM4YTA5OGUzNjQz
+    MzQ0ZmVhMTVlMDQyYzBkY2JkZmQxYWYzZmZkODU4NGRkZmM3MTY=

data/.yardopts

@@ -1,6 +1,6 @@
 --no-private
 --exclude features
---exclude lib/generators/**/*_spec.rb
+--exclude lib/generators/([^/]+/)*.*_spec.rb
 --markup markdown
 --template-path yard/template/
 -

data/Changelog.md

@@ -1,3 +1,16 @@
+### 3.0.0 / 2014-06-01
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.0.0.rc1...v3.0.0)
+
+Enhancements:
+
+* Separate RSpec configuration in generated `spec_helper` from Rails setup
+  and associated configuration options. Moving Rails specific settings and
+  options to `rails_helper`. (Aaron Kromer)
+
+Bug Fixes:
+
+* Fix an issue with fixture support when `ActiveRecord` isn't loaded. (Jon Rowe)
+
 ### 3.0.0.rc1 / 2014-05-18
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.0.0.beta2...v3.0.0.rc1)
 
@@ -63,13 +76,18 @@ Bug Fixes:
 * Require `rspec/collection_matchers` when `rspec/rails` is required. (Yuji Nakayama)
 
 ### 3.0.0.beta1 / 2013-11-07
-[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.99.0.rc1...v3.0.0.beta1)
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.99.0...v3.0.0.beta1)
 
 Breaking Changes for 3.0.0:
 
 * Extracts `autotest` and `autotest-rails` support to `rspec-autotest` gem.
   (Andy Lindeman)
 
+### 2.99.0 / 2014-06-01
+[Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.99.0.rc1...v2.99.0)
+
+No changes. Just taking it out of pre-release.
+
 ### 2.99.0.rc1 / 2014-05-18
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v2.99.0.beta2...v2.99.0.rc1)
 

data/lib/generators/rspec.rb

@@ -1,7 +1,11 @@
 require 'rails/generators/named_base'
 
+# Weirdly named generators namespace (should be `RSpec`) for compatability with
+# rails loading.
 module Rspec
+  # @private
   module Generators
+    # @private
     class Base < ::Rails::Generators::NamedBase
       def self.source_root
         @_rspec_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'rspec', generator_name, 'templates'))
@@ -16,8 +20,10 @@ module Rspec
   end
 end
 
+# @private
 module Rails
   module Generators
+    # @private
     class GeneratedAttribute
       def input_type
         @input_type ||= if type == :text

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

@@ -2,6 +2,7 @@ require 'generators/rspec'
 
 module Rspec
   module Generators
+    # @private
     class ControllerGenerator < Base
       argument :actions, :type => :array, :default => [], :banner => "action action"
 

data/lib/generators/rspec/controller/templates/controller_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
 
 <% module_namespacing do -%>
-describe <%= class_name %>Controller, :type => :controller do
+RSpec.describe <%= class_name %>Controller, :type => :controller do
 
 <% for action in actions -%>
   describe "GET '<%= action %>'" do

data/lib/generators/rspec/controller/templates/view_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe "<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>", :type => :view do
+RSpec.describe "<%= file_name %>/<%= @action %>.html.<%= options[:template_engine] %>", :type => :view do
   pending "add some examples to (or delete) #{__FILE__}"
 end

data/lib/generators/rspec/feature/feature_generator.rb

@@ -2,6 +2,7 @@ require 'generators/rspec'
 
 module Rspec
   module Generators
+    # @private
     class FeatureGenerator < Base
       class_option :feature_specs, :type => :boolean, :default => true, :desc => "Generate feature specs"
 

data/lib/generators/rspec/feature/templates/feature_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "<%= class_name.pluralize %>", :type => :feature do
   pending "add some scenarios (or delete) #{__FILE__}"

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

@@ -2,6 +2,7 @@ require 'generators/rspec'
 
 module Rspec
   module Generators
+    # @private
     class HelperGenerator < Base
       class_option :helper_specs, :type => :boolean, :default => true
 

data/lib/generators/rspec/helper/templates/helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 # Specs in this file have access to a helper object that includes
 # the <%= class_name %>Helper. For example:
@@ -11,7 +11,7 @@ require 'spec_helper'
 #   end
 # end
 <% module_namespacing do -%>
-describe <%= class_name %>Helper, :type => :helper do
+RSpec.describe <%= class_name %>Helper, :type => :helper do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

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

@@ -1,5 +1,8 @@
+RSpec::Support.require_rspec_core "project_initializer"
+
 module Rspec
   module Generators
+    # @private
     class InstallGenerator < ::Rails::Generators::Base
 
       desc <<DESC
@@ -11,14 +14,31 @@ DESC
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
 
-      def copy_dot_rspec
-        template '.rspec'
+      def copy_spec_files
+        Dir.mktmpdir do |dir|
+          generate_rspec_init dir
+          template File.join(dir, '.rspec'), '.rspec'
+          directory File.join(dir, 'spec'), 'spec'
+        end
       end
 
-      def copy_spec_files
-        directory 'spec'
+      def copy_rails_files
+        template 'spec/rails_helper.rb'
       end
 
+    private
+
+      def generate_rspec_init(tmpdir)
+        initializer = ::RSpec::Core::ProjectInitializer.new(
+          :destination => tmpdir,
+          :report_stream => StringIO.new
+        )
+        initializer.run
+        gsub_file File.join(tmpdir, 'spec', 'spec_helper.rb'),
+                  'rspec --init',
+                  'rails generate rspec:install',
+                  :verbose => false
+      end
     end
   end
 end

data/lib/generators/rspec/install/templates/spec/{spec_helper.rb.tt → rails_helper.rb}

@@ -1,5 +1,6 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
+require 'spec_helper'
 require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 
@@ -24,14 +25,6 @@ ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
 
 <% end -%>
 RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
@@ -40,24 +33,18 @@ RSpec.configure do |config|
   # instead of true.
   config.use_transactional_fixtures = true
 
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = "random"
-
   # RSpec Rails can automatically mix in different behaviours to your tests
   # based on their file location, for example enabling you to call `get` and
   # `post` in specs under `spec/controllers`.
   #
   # You can disable this behaviour by removing the line below, and instead
-  # explictly tag your specs with their type, e.g.:
+  # explicitly tag your specs with their type, e.g.:
   #
-  #     describe UsersController, :type => :controller do
+  #     RSpec.describe UsersController, :type => :controller do
   #       # ...
   #     end
   #
   # The different available types are documented in the features, such as in
-  # https://relishapp.com/rspec/rspec-rails/v/3-0/docs
+  # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
 end

data/lib/generators/rspec/integration/integration_generator.rb

@@ -2,6 +2,7 @@ require 'generators/rspec'
 
 module Rspec
   module Generators
+    # @private
     class IntegrationGenerator < Base
       class_option :request_specs,   :type => :boolean, :default => true,  :desc => "Generate request specs"
 

data/lib/generators/rspec/integration/templates/request_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe "<%= class_name.pluralize %>", :type => :request do
+RSpec.describe "<%= class_name.pluralize %>", :type => :request do
   describe "GET /<%= table_name %>" do
     it "works! (now write some real specs)" do
       get <%= index_helper %>_path

data/lib/generators/rspec/mailer/mailer_generator.rb

@@ -2,6 +2,7 @@ require 'generators/rspec'
 
 module Rspec
   module Generators
+    # @private
     class MailerGenerator < Base
       argument :actions, :type => :array, :default => [], :banner => "method method"
 

data/lib/generators/rspec/mailer/templates/mailer_spec.rb

@@ -1,7 +1,7 @@
-require "spec_helper"
+require "rails_helper"
 
 <% module_namespacing do -%>
-describe <%= class_name %>, :type => :mailer do
+RSpec.describe <%= class_name %>, :type => :mailer do
 <% for action in actions -%>
   describe "<%= action %>" do
     let(:mail) { <%= class_name %>.<%= action %> }

data/lib/generators/rspec/model/model_generator.rb

@@ -2,6 +2,7 @@ require 'generators/rspec'
 
 module Rspec
   module Generators
+    # @private
     class ModelGenerator < Base
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
       class_option :fixture, :type => :boolean

data/lib/generators/rspec/model/templates/model_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
 
 <% module_namespacing do -%>
-describe <%= class_name %>, :type => :model do
+RSpec.describe <%= class_name %>, :type => :model do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

data/lib/generators/rspec/observer/observer_generator.rb

@@ -2,6 +2,7 @@ require 'generators/rspec'
 
 module Rspec
   module Generators
+    # @private
     class ObserverGenerator < Base
       def generate_observer_spec
         template 'observer_spec.rb',

data/lib/generators/rspec/observer/templates/observer_spec.rb

@@ -1,7 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
 
 <% module_namespacing do -%>
-describe <%= class_name %>Observer, :type => :observer do
+RSpec.describe <%= class_name %>Observer, :type => :observer do
   pending "add some examples to (or delete) #{__FILE__}"
 end
 <% end -%>

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

@@ -3,6 +3,7 @@ require 'rails/generators/resource_helpers'
 
 module Rspec
   module Generators
+    # @private
     class ScaffoldGenerator < Base
       include ::Rails::Generators::ResourceHelpers
       source_paths << File.expand_path("../../helper/templates", __FILE__)
@@ -49,36 +50,6 @@ module Rspec
                    File.join("spec/views", controller_file_path, "#{view}.html.#{options[:template_engine]}_spec.rb")
         end
 
-        def example_valid_attributes
-          # Only take the first attribute so this hash does not become unweildy and large in the
-          # generated controller spec. It is the responsibility of the user to keep the the valid
-          # attributes method up-to-date as they add validations.
-          @example_valid_attributes ||=
-            if attributes.any?
-              { attributes.first.name => attributes.first.default.to_s }
-            else
-              { }
-            end
-        end
-
-        def example_invalid_attributes
-          @example_invalid_attributes ||=
-            if attributes.any?
-              { attributes.first.name => "invalid value" }
-            else
-              { }
-            end
-        end
-
-        def example_params_for_update
-          @example_params_for_update ||=
-            if example_valid_attributes.any?
-              example_valid_attributes
-            else
-              { "these" => "params" }
-            end
-        end
-
         def formatted_hash(hash)
           formatted = hash.inspect
           formatted.gsub!("{", "{ ")
@@ -164,14 +135,18 @@ module Rspec
         end
 
         def value_for(attribute)
+          raw_value_for(attribute).inspect
+        end
+
+        def raw_value_for(attribute)
           case attribute.type
           when :string
-            "#{attribute.name.titleize}".inspect
+            attribute.name.titleize
           when :integer
             @attribute_id_map ||= {}
-            @attribute_id_map[attribute] ||= @attribute_id_map.keys.size.next.to_s
+            @attribute_id_map[attribute] ||= @attribute_id_map.keys.size.next
           else
-            attribute.default.inspect
+            attribute.default
           end
         end
 

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 # This spec was generated by rspec-rails when you ran the scaffold generator.
 # It demonstrates how one might use RSpec to specify the controller code that
@@ -19,12 +19,18 @@ require 'spec_helper'
 # that an instance is receiving a specific message.
 
 <% module_namespacing do -%>
-describe <%= controller_class_name %>Controller, :type => :controller do
+RSpec.describe <%= controller_class_name %>Controller, :type => :controller do
 
   # This should return the minimal set of attributes required to create a valid
   # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
   # adjust the attributes here as well.
-  let(:valid_attributes) { <%= formatted_hash(example_valid_attributes) %> }
+  let(:valid_attributes) {
+    skip("Add a hash of attributes valid for your model")
+  }
+
+  let(:invalid_attributes) {
+    skip("Add a hash of attributes invalid for your model")
+  }
 
   # This should return the minimal set of values that should be in the session
   # in order to pass any filters (e.g. authentication) defined in
@@ -86,16 +92,12 @@ describe <%= controller_class_name %>Controller, :type => :controller do
 
     describe "with invalid params" do
       it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        allow_any_instance_of(<%= class_name %>).to receive(:save).and_return(false)
-        post :create, {:<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
+        post :create, {:<%= ns_file_name %> => invalid_attributes}, valid_session
         expect(assigns(:<%= ns_file_name %>)).to be_a_new(<%= class_name %>)
       end
 
       it "re-renders the 'new' template" do
-        # Trigger the behavior that occurs when invalid params are submitted
-        allow_any_instance_of(<%= class_name %>).to receive(:save).and_return(false)
-        post :create, {:<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
+        post :create, {:<%= ns_file_name %> => invalid_attributes}, valid_session
         expect(response).to render_template("new")
       end
     end
@@ -103,18 +105,15 @@ describe <%= controller_class_name %>Controller, :type => :controller do
 
   describe "PUT update" do
     describe "with valid params" do
+      let(:new_attributes) {
+        skip("Add a hash of attributes valid for your model")
+      }
+
       it "updates the requested <%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        # Assuming there are no other <%= table_name %> in the database, this
-        # specifies that the <%= class_name %> created on the previous line
-        # receives the :update_attributes message with whatever params are
-        # submitted in the request.
-        <%- if ::Rails::VERSION::STRING >= '4' -%>
-        expect_any_instance_of(<%= class_name %>).to receive(:update).with(<%= formatted_hash(example_params_for_update) %>)
-        <%- else -%>
-        expect_any_instance_of(<%= class_name %>).to receive(:update_attributes).with(<%= formatted_hash(example_params_for_update) %>)
-        <%- end -%>
-        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_params_for_update) %>}, valid_session
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => new_attributes}, valid_session
+        <%= file_name %>.reload
+        skip("Add assertions for updated state")
       end
 
       it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
@@ -133,25 +132,13 @@ describe <%= controller_class_name %>Controller, :type => :controller do
     describe "with invalid params" do
       it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        # Trigger the behavior that occurs when invalid params are submitted
-        <%- if ::Rails::VERSION::STRING >= '4' -%>
-        allow_any_instance_of(<%= class_name %>).to receive(:update).and_return(false)
-        <%- else -%>
-        allow_any_instance_of(<%= class_name %>).to receive(:update_attributes).and_return(false)
-        <%- end -%>
-        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => invalid_attributes}, valid_session
         expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
       end
 
       it "re-renders the 'edit' template" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        # Trigger the behavior that occurs when invalid params are submitted
-        <%- if ::Rails::VERSION::STRING >= '4' -%>
-        allow_any_instance_of(<%= class_name %>).to receive(:update).and_return(false)
-        <%- else -%>
-        allow_any_instance_of(<%= class_name %>).to receive(:update_attributes).and_return(false)
-        <%- end -%>
-        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => invalid_attributes}, valid_session
         expect(response).to render_template("edit")
       end
     end