welaika-suspenders 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 377a4431fc849249a46167d160727edc654bc32b
-  data.tar.gz: f4fdbab0bd63319eabdddb3d014ed9a9936dbda7
+  metadata.gz: ebc1d7d5851153cb0c16d9e902e2c1391782082d
+  data.tar.gz: f9afc62258bf8dfe56221aca5b9e0595a465e98f
 SHA512:
-  metadata.gz: 9739979380d7267b209bf5075f38502f9455d7b370d72571adad3ce3c1f3d3c3f80132a2c043cd5d266832405a06ca9c0a90ad85fba48b195e97c37625f0c46d
-  data.tar.gz: 58ca10cb9c05d8b7ecab3a36ed0ed2cfaf46eb5cdd45140ee9f6ffa05f06a51764678a8031a3ff499f05531b49be5f8209d51ab81618ddb76f58cec4ea294147
+  metadata.gz: 6672881f0c641fba3af0d7b9af115b3e8fbea2329d0a7656d66d7cb16ca3978f73ab53038501e583c12ec645ea9858b8e14a722c294fc3f31c8856e13d8b0c75
+  data.tar.gz: 6076fc65b6ed635fce682b9265052ebc8fd2881249f93bc1937cbdbbc218526d945fdc53ca4803d0212efab4c99e08e268b93a81b216e85a4442b6731b8223a4

data/Gemfile.lock

@@ -1,44 +1,44 @@
 PATH
   remote: .
   specs:
-    welaika-suspenders (2.11.0)
+    welaika-suspenders (2.12.0)
       bitters (~> 1.0.0)
       bundler (~> 1.3)
-      rails (= 4.2.1)
+      rails (~> 4.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
       globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -53,55 +53,46 @@ GEM
       sass (~> 3.4)
       thor
     builder (3.2.2)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
-    capybara (2.3.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+    byebug (4.0.5)
+      columnize (= 0.9.0)
     coderay (1.1.0)
     columnize (0.9.0)
-    debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    json (1.8.2)
+    json (1.8.3)
     loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.4.3)
-    mini_portile (0.6.0)
-    minitest (5.6.1)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.0.1)
-      byebug (~> 3.4)
+    pry-byebug (3.1.0)
+      byebug (~> 4.0)
       pry (~> 0.10)
-    rack (1.6.0)
-    rack-test (0.6.2)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
+      railties (= 4.2.3)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -111,25 +102,30 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.0)
-    rspec-expectations (2.99.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.0)
-    sass (3.4.13)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    sass (3.4.15)
     slop (3.6.0)
-    sprockets (3.1.0)
+    sprockets (3.2.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.1)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -137,14 +133,14 @@ GEM
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (~> 2.2, >= 2.2.0)
   pry-byebug
-  rspec (~> 2.0)
+  rspec (~> 3.2)
   welaika-suspenders!
+
+BUNDLED WITH
+   1.10.5

data/NEWS.md

@@ -1,3 +1,10 @@
+1.29.0 (June 16, 2015)
+
+* Generate rake, rails and rspec binstubs with Spring
+* Remove Capybara and use RSpec 3.2 for development
+* Improves suspenders' test suite speed
+* Refills `flashes.scss` bugfix
+
 1.28.0 (May 9, 2015)
 
 * Require spec/support files in a certain order
@@ -16,7 +23,7 @@
 * Add code of conduct to CONTRIBUTING document
 * Only use rack-timeout in staging and production
 * Add SimpleCov
-* Avoid generation of extra _flashes view
+* Avoid generation of extra `_flashes` view
 * Fix Travis CI install step
 * Cache bundle in Travis CI runs
 

data/README.md

@@ -28,7 +28,7 @@ You can optionally specify alternate Heroku flags:
 
     welaika-suspenders projectname \
       --heroku true \
-      --heroku-flags "--region eu --addons newrelic,pgbackups,sendgrid,ssl"
+      --heroku-flags "--region eu --addons newrelic,sendgrid,ssl"
 
 See all possible Heroku flags:
 
@@ -69,10 +69,17 @@ List of changes we made since [this is commit](https://github.com/thoughtbot/sus
 - create a .ruby-gemset file with app name
 - create common folders like `app/queries`, `app/services`, etc.
 - use `application.css.sass` instead of `application.css.scss`
-- do not import refills/flashes
 - add `quiet_assets` gem
 - add `brakeman` gem
 - change `i18n_tasks` configuration: set `it` as base locale
 - set `Rome` as `time_zone`
 - set `:it` as `default_locale`
 - add [simplecov](https://github.com/colszowka/simplecov)
+- add fixtures helper for `rspec`
+- add queries helper for `rspec`
+- configure asset host for capybara
+- add helpers for capybara (`page!`, `screenshot!`)
+- drop support for IE 9 in AutoPrefixer
+- removed [hound](https://houndci.com) configuration
+- add [bullet](https://github.com/flyerhzm/bullet)
+- set `unicorn` workers to 1 for `webconsole`

data/lib/suspenders/app_builder.rb

@@ -19,6 +19,19 @@ module Suspenders
       )
     end
 
+    def configure_bullet
+      config = <<-RUBY.strip_heredoc
+      config.after_initialize do
+          Bullet.enable = true
+          Bullet.bullet_logger = true
+          Bullet.console = true
+          Bullet.rails_logger = true
+          # Bullet.stacktrace_includes = [ 'your_gem', 'your_middleware' ]
+        end
+      RUBY
+      configure_environment "development", config
+    end
+
     def raise_on_unpermitted_parameters
       config = <<-RUBY
     config.action_controller.action_on_unpermitted_parameters = :raise
@@ -58,6 +71,15 @@ module Suspenders
       copy_file 'factory_girl_rspec.rb', 'spec/support/factory_girl.rb'
     end
 
+    def set_up_capybara_for_rspec
+      template 'capybara_rspec.rb.erb', 'spec/support/capybara.rb', port_number: port
+    end
+
+    def add_helpers_for_rspec
+      copy_file 'queries_helper_rspec.rb', 'spec/support/queries_helper.rb'
+      copy_file 'fixtures_helper_rspec.rb', 'spec/support/fixtures_helper.rb'
+    end
+
     def configure_newrelic
       template 'newrelic.yml.erb', 'config/newrelic.yml'
     end
@@ -314,6 +336,12 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
         'app/assets/stylesheets/application.css.sass'
     end
 
+    def install_refills
+      run "rails generate refills:import flashes"
+      run "rm app/views/refills/_flashes.html.erb"
+      run "rmdir app/views/refills"
+    end
+
     def install_bitters
       run "bitters install --path app/assets/stylesheets"
     end
@@ -334,6 +362,7 @@ Rack::Timeout.timeout = (ENV["RACK_TIMEOUT"] || 10).to_i
         'spec/presenters',
         'spec/queries',
         'spec/services',
+        'spec/fixtures',
         'spec/support/matchers',
         'spec/support/mixins',
         'spec/support/shared_examples'
@@ -429,6 +458,14 @@ you can deploy to staging and production with:
       append_file "Rakefile", %{\ntask default: "bundler:audit"\n}
     end
 
+    def setup_spring
+      bundle_command "exec spring binstub --all"
+    end
+
+    def create_binstubs
+      bundle_command "binstubs brakeman"
+    end
+
     def copy_miscellaneous_files
       copy_file "browserslist", "browserslist"
       copy_file "errors.rb", "config/initializers/errors.rb"
@@ -499,7 +536,7 @@ end
     end
 
     def port
-      @port ||= [3000, 4000, 5000, 7000, 8000, 9000].sample
+      @@port ||= [3000, 4000, 5000, 7000, 8000, 9000].sample
     end
 
     def serve_static_files_line

data/lib/suspenders/generators/app_generator.rb

@@ -40,6 +40,7 @@ module Suspenders
       invoke :configure_app
       invoke :setup_stylesheets
       invoke :install_bitters
+      invoke :install_refills
       invoke :copy_miscellaneous_files
       invoke :customize_error_pages
       invoke :remove_routes_comment_lines
@@ -48,6 +49,8 @@ module Suspenders
       invoke :create_heroku_apps
       invoke :create_github_repo
       invoke :setup_bundler_audit
+      invoke :setup_spring
+      invoke :create_binstubs
       invoke :outro
     end
 
@@ -77,6 +80,7 @@ module Suspenders
       say 'Setting up the development environment'
       build :raise_on_delivery_errors
       build :configure_letter_opener
+      build :configure_bullet
       build :raise_on_unpermitted_parameters
       build :provide_setup_script
       build :provide_dev_prime_task
@@ -87,6 +91,8 @@ module Suspenders
     def setup_test_environment
       say 'Setting up the test environment'
       build :set_up_factory_girl_for_rspec
+      build :set_up_capybara_for_rspec
+      build :add_helpers_for_rspec
       build :generate_rspec
       build :configure_rspec
       build :configure_background_jobs_for_rspec
@@ -153,6 +159,11 @@ module Suspenders
       build :install_bitters
     end
 
+    def install_refills
+      say "Install Refills"
+      build :install_refills
+    end
+
     def setup_git
       if !options[:skip_git]
         say 'Initializing git'
@@ -188,6 +199,16 @@ module Suspenders
       build :setup_bundler_audit
     end
 
+    def setup_spring
+      say "Springifying binstubs"
+      build :setup_spring
+    end
+
+    def create_binstubs
+      say "Create binstubs"
+      build :create_binstubs
+    end
+
     def init_git
       build :init_git
     end

data/lib/suspenders/version.rb

@@ -1,5 +1,5 @@
 module Suspenders
-  RAILS_VERSION = "4.2.1"
+  RAILS_VERSION = "~> 4.2.0"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "2.11.0"
+  VERSION = "2.12.0"
 end

data/spec/features/github_spec.rb

@@ -1,7 +1,12 @@
-require 'spec_helper'
+require "spec_helper"
 
-feature 'GitHub' do
-  scenario 'Suspend a project with --github option' do
+RSpec.describe "GitHub" do
+  before do
+    drop_dummy_database
+    remove_project_directory
+  end
+
+  it "suspends a project with --github option" do
     repo_name = 'test'
     run_suspenders("--github=#{repo_name}")
 

data/spec/features/heroku_spec.rb

@@ -1,7 +1,12 @@
 require "spec_helper"
 
-feature "Heroku" do
-  scenario "Suspend a project for Heroku" do
+RSpec.describe "Heroku" do
+  before do
+    drop_dummy_database
+    remove_project_directory
+  end
+
+  it "suspends a project for Heroku" do
     run_suspenders("--heroku=true")
 
     expect(FakeHeroku).to have_gem_included(project_path, "rails_stdout_logging")
@@ -30,7 +35,7 @@ feature "Heroku" do
     expect(readme).to include("./bin/deploy production")
   end
 
-  scenario "Suspend a project with extra Heroku flags" do
+  it "suspends a project with extra Heroku flags" do
     run_suspenders(%{--heroku=true --heroku-flags="--region eu"})
 
     expect(FakeHeroku).to have_created_app_for("staging", "--region eu")

data/spec/features/new_project_spec.rb

@@ -1,9 +1,13 @@
-require 'spec_helper'
+require "spec_helper"
 
-feature 'Suspend a new project with default configuration' do
-  scenario 'specs pass' do
+RSpec.describe "Suspend a new project with default configuration" do
+  before(:all) do
+    drop_dummy_database
+    remove_project_directory
     run_suspenders
+  end
 
+  it "ensures project specs pass" do
     Dir.chdir(project_path) do
       Bundler.with_clean_env do
         expect(`rake`).to include('0 failures')
@@ -11,9 +15,7 @@ feature 'Suspend a new project with default configuration' do
     end
   end
 
-  scenario 'staging config is inherited from production' do
-    run_suspenders
-
+  it "inherits staging config from production" do
     staging_file = IO.read("#{project_path}/config/environments/staging.rb")
     config_stub = "Rails.application.configure do"
 
@@ -21,45 +23,45 @@ feature 'Suspend a new project with default configuration' do
     expect(staging_file).to match(/#{config_stub}/), staging_file
   end
 
-  scenario 'generated .ruby-version is pulled from Suspenders .ruby-version' do
-    run_suspenders
-
+  it "creates .ruby-version from Suspenders .ruby-version" do
     ruby_version_file = IO.read("#{project_path}/.ruby-version")
 
     expect(ruby_version_file).to eq "#{RUBY_VERSION}\n"
   end
 
-  scenario 'generated .ruby-gemset is pulled from app name' do
-    run_suspenders
-
+  it 'creates .ruby-gemset from app name' do
     ruby_gemset_file = IO.read("#{project_path}/.ruby-gemset")
 
     expect(ruby_gemset_file).to eq "#{SuspendersTestHelpers::APP_NAME}\n"
   end
 
-  scenario 'secrets.yml reads secret from env' do
-    run_suspenders
-
+  it "loads secret_key_base from env" do
     secrets_file = IO.read("#{project_path}/config/secrets.yml")
 
     expect(secrets_file).to match(/secret_key_base: <%= ENV\["SECRET_KEY_BASE"\] %>/)
   end
 
-  scenario 'action mailer support file is added' do
-    run_suspenders
-
+  it "adds support file for action mailer" do
     expect(File).to exist("#{project_path}/spec/support/action_mailer.rb")
   end
 
-  scenario "i18n support file is added" do
-    run_suspenders
-
+  it "adds support file for i18n" do
     expect(File).to exist("#{project_path}/spec/support/i18n.rb")
   end
 
-  scenario 'newrelic.yml reads NewRelic license from env' do
-    run_suspenders
+  it "adds support file for factory girl" do
+    expect(File).to exist("#{project_path}/spec/support/factory_girl.rb")
+  end
+
+  it "adds rspec helper for fixtures" do
+    expect(File).to exist("#{project_path}/spec/support/fixtures_helper.rb")
+  end
+
+  it "adds rspec helper for queries" do
+    expect(File).to exist("#{project_path}/spec/support/queries_helper.rb")
+  end
 
+  it "ensures newrelic.yml reads NewRelic license from env" do
     newrelic_file = IO.read("#{project_path}/config/newrelic.yml")
 
     expect(newrelic_file).to match(
@@ -67,9 +69,7 @@ feature 'Suspend a new project with default configuration' do
     )
   end
 
-  scenario "set up locale and timezone" do
-    run_suspenders
-
+  it "configs locale and timezone" do
     result = IO.read("#{project_path}/config/application.rb")
 
     expect(result).to match(/^ +config.i18n.enforce_available_locales = true$/)
@@ -79,9 +79,7 @@ feature 'Suspend a new project with default configuration' do
     expect(result).to match(/^ +config.time_zone = 'Rome'$/)
   end
 
-  scenario "raises on unpermitted parameters in all environments" do
-    run_suspenders
-
+  it "raises on unpermitted parameters in all environments" do
     result = IO.read("#{project_path}/config/application.rb")
 
     expect(result).to match(
@@ -89,9 +87,7 @@ feature 'Suspend a new project with default configuration' do
     )
   end
 
-  scenario "raises on missing translations in development and test" do
-    run_suspenders
-
+  it "raises on missing translations in development and test" do
     %w[development test].each do |environment|
       environment_file =
         IO.read("#{project_path}/config/environments/#{environment}.rb")
@@ -101,54 +97,37 @@ feature 'Suspend a new project with default configuration' do
     end
   end
 
-  scenario "specs for missing or unused translations" do
-    run_suspenders
-
+  it "adds specs for missing or unused translations" do
     expect(File).to exist("#{project_path}/spec/i18n_spec.rb")
   end
 
-  scenario "config file for i18n tasks" do
-    run_suspenders
-
+  it "configs i18n-tasks" do
     expect(File).to exist("#{project_path}/config/i18n-tasks.yml")
   end
 
-  scenario "generated en.yml is evaluated" do
-    run_suspenders
-
-    locales_en_file = "#{project_path}/config/locales/en.yml"
-    locales_it_file = "#{project_path}/config/locales/it.yml"
+  it "evaluates en.yml.erb" do
+    locales_it_file = IO.read("#{project_path}/config/locales/it.yml")
     app_name = SuspendersTestHelpers::APP_NAME
-
-    expect(File.exist?(locales_en_file)).to eq(false)
-    expect(IO.read(locales_it_file)).to match(/application: #{app_name.humanize}/)
+    expect(locales_it_file).to match(/application: #{app_name.humanize}/)
   end
 
-  scenario "config simple_form" do
-    run_suspenders
-
+  it "configs simple_form" do
     expect(File).to exist("#{project_path}/config/initializers/simple_form.rb")
   end
 
-  scenario "config :letter_opener as email delivery method for development" do
-    run_suspenders
-
+  it "configs :letter_opener as email delivery method for development" do
     dev_env_file = IO.read("#{project_path}/config/environments/development.rb")
     expect(dev_env_file).
       to match(/^ +config.action_mailer.delivery_method = :letter_opener$/)
   end
 
-  scenario "set up simplecov" do
-    run_suspenders
-
+  it "configs simplecov" do
     spec_helper_file = IO.read("#{project_path}/spec/spec_helper.rb")
     expect(spec_helper_file).to match(/^require "simplecov"$/)
     expect(spec_helper_file).to match(/^SimpleCov.start "rails" do$/)
   end
 
-  scenario "config active job queue adapter" do
-    run_suspenders
-
+  it "configs active job queue adapter" do
     application_config = IO.read("#{project_path}/config/application.rb")
     test_config = IO.read("#{project_path}/config/environments/test.rb")
 
@@ -160,6 +139,25 @@ feature 'Suspend a new project with default configuration' do
     )
   end
 
+  it "adds spring to binstubs" do
+    expect(File).to exist("#{project_path}/bin/spring")
+
+    spring_line = /^ +load File.expand_path\("\.\.\/spring", __FILE__\)$/
+    bin_stubs = %w(rake rails rspec)
+    bin_stubs.each do |bin_stub|
+      expect(IO.read("#{project_path}/bin/#{bin_stub}")).to match(spring_line)
+    end
+  end
+
+  it "adds rspec's helper files" do
+    expect(File).to exist("#{project_path}/spec/spec_helper.rb")
+    expect(File).to exist("#{project_path}/spec/rails_helper.rb")
+  end
+
+  it "creates binstubs" do
+    expect(File).to exist("#{project_path}/bin/brakeman")
+  end
+
   def analytics_partial
     IO.read("#{project_path}/app/views/application/_analytics.html.erb")
   end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require "capybara/rspec"
 require "bundler/setup"
 require "pry-byebug"
 
@@ -16,9 +15,6 @@ RSpec.configure do |config|
   end
 
   config.before(:each) do
-    drop_dummy_database
-    remove_project_directory
-
     FakeHeroku.clear!
     FakeGithub.clear!
   end

data/suspenders.gemspec

@@ -29,7 +29,6 @@ weLaika's fork of the famous thoughbot suspenders gem.
   s.add_dependency 'bundler', '~> 1.3'
   s.add_dependency 'rails', Suspenders::RAILS_VERSION
 
-  s.add_development_dependency 'rspec', '~> 2.0'
-  s.add_development_dependency 'capybara', '~> 2.2', '>= 2.2.0'
+  s.add_development_dependency 'rspec', '~> 3.2'
   s.add_development_dependency 'pry-byebug'
 end

data/templates/Gemfile.erb

@@ -20,6 +20,7 @@ gem "rack-canonical-host"
 gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 gem "rails-i18n"
 gem "recipient_interceptor"
+gem "refills"
 gem "sass-rails", "~> 5.0"
 gem "slim-rails"
 gem "simple_form"
@@ -38,6 +39,7 @@ end
 group :development, :test do
   gem "awesome_print"
   gem "brakeman", require:false
+  gem "bullet"
   gem "bundler-audit", require: false
   gem "dotenv-rails"
   gem "faker"
@@ -46,7 +48,7 @@ group :development, :test do
   gem "pry-bloodline"
   gem "pry-byebug"
   gem "pry-rails"
-  gem "rspec-rails", "~> 3.2.1"
+  gem "rspec-rails", "~> 3.3.0"
 end
 
 group :test do

data/templates/application.css.sass

@@ -5,3 +5,4 @@
 @import "base/grid-settings"
 @import "neat"
 @import "base/base"
+@import "refills/flashes"

data/templates/browserslist

@@ -1,4 +1,4 @@
 Last 2 versions
-Explorer >= 9
+Explorer >= 10
 iOS >= 7.1
 Android >= 4.4

data/templates/capybara_rspec.rb.erb

@@ -0,0 +1,23 @@
+Capybara.javascript_driver = :webkit
+Capybara.asset_host = "http://localhost:<%= config[:port_number] %>"
+
+module CapybaraHelper
+
+  def page!
+    save_and_open_page
+  end
+
+  def screenshot!
+    save_and_open_screenshot
+  end
+end
+
+Capybara::Webkit.configure do |config|
+  config.allow_url(
+    %w(fonts.googleapis.com)
+  )
+end
+
+RSpec.configure do |config|
+  config.include CapybaraHelper, type: :feature
+end

data/templates/fixtures_helper_rspec.rb

@@ -0,0 +1,9 @@
+module FixturesHelpers
+  def fixture_path_for(filename)
+    File.expand_path(File.join("..", "..", "fixtures", filename), __FILE__)
+  end
+end
+
+RSpec.configure do |config|
+  config.include FixturesHelpers
+end

data/templates/queries_helper_rspec.rb

@@ -0,0 +1,20 @@
+module QueriesHelper
+  def log_queries!
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+  end
+
+  def do_not_log_queries!
+    ActiveRecord::Base.logger = nil
+  end
+
+  def logging_queries
+    log_queries!
+    yield
+  ensure
+    do_not_log_queries!
+  end
+end
+
+RSpec.configure do |config|
+  config.include QueriesHelper
+end

data/templates/rails_helper.rb

@@ -20,4 +20,3 @@ RSpec.configure do |config|
 end
 
 ActiveRecord::Migration.maintain_test_schema!
-Capybara.javascript_driver = :webkit

data/templates/sample.env

@@ -4,3 +4,4 @@ HOST=localhost:3000
 RACK_ENV=development
 SECRET_KEY_BASE=development_secret
 EXECJS_RUNTIME=Node
+UNICORN_WORKERS=1

data/templates/spec_helper.rb

@@ -19,6 +19,7 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
+  config.example_status_persistence_file_path = "tmp/rspec_examples.txt"
   config.order = :random
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: welaika-suspenders
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - thoughtbot
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bitters
@@ -41,52 +41,32 @@ dependencies:
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 4.2.1
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: 4.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +131,7 @@ files:
 - templates/bin_setup.erb
 - templates/browserslist
 - templates/bundler_audit.rake
+- templates/capybara_rspec.rb.erb
 - templates/config_i18n_tasks.yml
 - templates/config_locales_it.yml.erb
 - templates/database_cleaner_rspec.rb
@@ -158,11 +139,13 @@ files:
 - templates/disable_xml_params.rb
 - templates/errors.rb
 - templates/factory_girl_rspec.rb
+- templates/fixtures_helper_rspec.rb
 - templates/flashes_helper.rb
 - templates/i18n.rb
 - templates/json_encoding.rb
 - templates/newrelic.yml.erb
 - templates/postgresql_database.yml.erb
+- templates/queries_helper_rspec.rb
 - templates/rails_helper.rb
 - templates/sample.env
 - templates/secrets.yml
@@ -195,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using thoughtbot's best practices.