Merge pull request #1502 from deivid-rodriguez/development_improvements

Development improvements

Author: Sam Phippen

Gemfile-rails-dependencies

@@ -19,7 +19,7 @@ when nil, false, ""
     # Rails 4+ requires 1.9.3+, so on earlier versions default to the last 3.x release.
     gem "rails", "~> 3.2.17"
   else
-    gem "rails", "~> 4.0.4"
+    gem "rails", "~> 4.2.0"
   end
 else
   gem "rails", version

Rakefile

@@ -120,7 +120,7 @@ end
 namespace :no_active_record do
   example_app_dir = './tmp/no_ar_example_app'
 
-  desc "run a vairety of specs against a non-ActiveRecord generated app"
+  desc "run a variety of specs against a non-ActiveRecord generated app"
   task :smoke do
     in_example_app "LOCATION='../../example_app_generator/run_specs.rb' bin/rake rails:template --backtrace",
                    :app_dir => example_app_dir
@@ -151,21 +151,19 @@ namespace :no_active_record do
         sh "rm -f #{bindir}/rails"
         sh "bundle exec rails new #{example_app_dir} --skip-active-record --skip-javascript --skip-sprockets --skip-git --skip-test-unit --skip-bundle --template=example_app_generator/generate_app.rb"
 
-        if test 'd', bindir
-          in_example_app(:app_dir => example_app_dir) do
-            sh "bundle install --gemfile ./Gemfile --path ../../../bundle"
-            # Rails 4 cannot use a `rails` binstub generated by Bundler
-            sh "bundle binstubs rspec-core rake --force"
-            sh "bundle binstubs railties" unless File.exist?("bin/rails")
-
-            application_file = File.read("config/application.rb")
-            sh "rm config/application.rb"
-            File.open("config/application.rb","w") do |f|
-              f.write application_file.gsub(
-                "config.assets.enabled = true",
-                "config.assets.enabled = false"
-              )
-            end
+        in_example_app(:app_dir => example_app_dir) do
+          sh "./travis_retry_bundle_install.sh 2>&1"
+          # Rails 4 cannot use a `rails` binstub generated by Bundler
+          sh "bundle binstubs rspec-core rake --force"
+          sh "bundle binstubs railties" unless File.exist?("bin/rails")
+
+          application_file = File.read("config/application.rb")
+          sh "rm config/application.rb"
+          File.open("config/application.rb","w") do |f|
+            f.write application_file.gsub(
+              "config.assets.enabled = true",
+              "config.assets.enabled = false"
+            )
           end
         end
       end

rspec-rails.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.description = "rspec-rails is a testing framework for Rails 3.x and 4.x."
 
   s.files            = `git ls-files -- lib/*`.split("\n")
-  s.files           += %w[README.md License.md Changelog.md Capybara.md .yardopts .document]
+  s.files           += %w[README.md LICENSE.md Changelog.md Capybara.md .yardopts .document]
   s.test_files       = []
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_path     = "lib"
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
     end
   end
 
-  s.add_development_dependency 'rake',     '~> 10.0.0'
+  s.add_development_dependency 'rake',     '~> 10.0'
   s.add_development_dependency 'cucumber', '~> 1.3.5'
   s.add_development_dependency 'aruba',    '~> 0.5.4'
   s.add_development_dependency 'ammeter',  '1.1.2'

spec/generators/rspec/install/install_generator_spec.rb

@@ -27,7 +27,7 @@ def require_rspec_rails
     match(/^require 'rspec\/rails'$/m)
   end
 
-  def use_transactional_fixtures
+  def have_transactional_fixtures_enabled?
     match(/config\.use_transactional_fixtures/m)
   end
 
@@ -70,7 +70,7 @@ def filter_rails_from_backtrace
 
     specify "with default fixture path" do
       run_generator
-      expect(rails_helper).to use_transactional_fixtures
+      expect(rails_helper).to have_transactional_fixtures_enabled?
     end
 
     specify "excluding rails gems from the backtrace" do
@@ -114,7 +114,7 @@ def filter_rails_from_backtrace
 
     it "does not include config.use_transactional_fixtures" do
       run_generator
-      expect(rails_helper).not_to use_transactional_fixtures
+      expect(rails_helper).not_to have_transactional_fixtures_enabled?
     end
 
     it "does not check use active record migration options" do

spec/spec_helper.rb

@@ -1,9 +1,5 @@
 require 'rails/all'
 
-class << RSpec
-  attr_writer :configuration
-end
-
 module RSpecRails
   class Application < ::Rails::Application
     self.config.secret_key_base = 'ASecretString' if config.respond_to? :secret_key_base