suspenders 1.51.0 → 1.55.0

data/spec/features/staging/pull_requests_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-RSpec.describe "suspenders:staging:pull_requests", type: :generators do
+RSpec.describe "suspenders:staging:pull_requests", type: :generator do
   it "generates the configuration for Heroku pipeline review apps" do
     with_app { generate("suspenders:staging:pull_requests") }
 

data/spec/features/static_spec.rb

@@ -0,0 +1,17 @@
+require "spec_helper"
+
+RSpec.describe "suspenders:static", type: :generator do
+  it "adds the gem and pages directory" do
+    with_app { generate("suspenders:static") }
+
+    expect("Gemfile").to match_contents(/high_voltage/)
+    expect("app/views/pages/.keep").to exist_as_a_file
+  end
+
+  it "removes the gem and pages directory" do
+    with_app { destroy("suspenders:static") }
+
+    expect("app/views/pages/.keep").not_to exist_as_a_file
+    expect("Gemfile").not_to match_contents(/high_voltage/)
+  end
+end

data/spec/features/stylelint_spec.rb

@@ -5,8 +5,8 @@ RSpec.describe "suspenders:stylelint", type: :generator do
     it "creates .stylelintrc.json" do
       with_app { generate("suspenders:stylelint") }
 
-      expect(".stylelintrc.json").
-        to match_contents(%r{"extends": "@thoughtbot/stylelint-config"})
+      expect(".stylelintrc.json")
+        .to match_contents(%r{"extends": "@thoughtbot/stylelint-config"})
     end
 
     it "adds stylelint and @thoughtbot/stylelint-config to the package.json" do
@@ -21,7 +21,7 @@ RSpec.describe "suspenders:stylelint", type: :generator do
       with_app { generate("suspenders:stylelint") }
 
       expect(".hound.yml").to(
-        match_contents(/^  config_file: \.stylelintrc\.json/),
+        match_contents(/^  config_file: \.stylelintrc\.json/)
       )
     end
   end
@@ -43,8 +43,8 @@ RSpec.describe "suspenders:stylelint", type: :generator do
       end
 
       expect("package.json").not_to match_contents(/stylelint/)
-      expect("package.json").
-        not_to match_contents(%r{@thoughtbot/stylelint-config})
+      expect("package.json")
+        .not_to match_contents(%r{@thoughtbot/stylelint-config})
     end
 
     it "comments in the hound config_file option" do
@@ -53,8 +53,8 @@ RSpec.describe "suspenders:stylelint", type: :generator do
         destroy("suspenders:stylelint")
       end
 
-      expect(".hound.yml").
-        to match_contents(/^  # config_file: \.stylelintrc\.json/)
+      expect(".hound.yml")
+        .to match_contents(/^  # config_file: \.stylelintrc\.json/)
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
-require 'bundler/setup'
+require "bundler/setup"
 
 Bundler.require(:default, :test)
 
-require (Pathname.new(__FILE__).dirname + '../lib/suspenders').expand_path
+require (Pathname.new(__FILE__).dirname + "../lib/suspenders").expand_path
 
-Dir['./spec/support/**/*.rb'].each { |file| require file }
+Dir["./spec/support/**/*.rb"].sort.each { |file| require file }
 
 RSpec.configure do |config|
   config.include SuspendersTestHelpers

data/spec/support/contain_json_matcher.rb

@@ -4,21 +4,27 @@ require "json"
 
 RSpec::Matchers.define :contain_json do
   match do
-    sub_json = expected
-    filename = actual
+    @sub_json = expected
+    @filename = actual
 
-    filepath = File.join(project_path, filename)
-    json = JSON.parse(IO.read(filepath), symbolize_names: true)
-    sub_json <= json
+    @filepath = File.join(project_path, @filename)
+    @json = JSON.parse(IO.read(@filepath), symbolize_names: true)
+
+    subhash?(@sub_json, @json)
   end
 
   failure_message do
-    sub_json = expected
-    filename = actual
+    "in #{@filename}, expected to find\n#{@sub_json.inspect}\n" \
+      "in\n#{@json.inspect}"
+  end
 
-    filepath = File.join(project_path, filename)
-    json = JSON.parse(IO.read(filepath), symbolize_names: true)
+  private
 
-    "in #{filename}, expected to find\n#{sub_json.inspect}\nin\n#{json.inspect}"
+  def subhash?(inner, outer)
+    if inner.is_a?(Hash) && outer.is_a?(Hash)
+      inner.all? { |key, value| subhash?(value, outer[key]) }
+    else
+      inner == outer
+    end
   end
 end

data/spec/support/fake_github.rb

@@ -1,13 +1,13 @@
 class FakeGithub
-  RECORDER = File.expand_path(File.join('..', '..', 'tmp', 'hub_commands'), File.dirname(__FILE__))
+  RECORDER = File.expand_path(File.join("..", "..", "tmp", "hub_commands"), File.dirname(__FILE__))
 
   def initialize(args)
     @args = args
   end
 
   def run!
-    File.open(RECORDER, 'a') do |file|
-      file.write @args.join(' ')
+    File.open(RECORDER, "a") do |file|
+      file.write @args.join(" ")
     end
   end
 

data/spec/support/fake_heroku.rb

@@ -1,5 +1,5 @@
 class FakeHeroku
-  RECORDER = File.expand_path(File.join('..', '..', 'tmp', 'heroku_commands'), File.dirname(__FILE__))
+  RECORDER = File.expand_path(File.join("..", "..", "tmp", "heroku_commands"), File.dirname(__FILE__))
 
   def initialize(args)
     @args = args
@@ -9,8 +9,8 @@ class FakeHeroku
     if @args.first == "help"
       puts "pipelines      #  manage collections of apps in pipelines"
     end
-    File.open(RECORDER, 'a') do |file|
-      file.puts @args.join(' ')
+    File.open(RECORDER, "a") do |file|
+      file.puts @args.join(" ")
     end
   end
 
@@ -19,7 +19,7 @@ class FakeHeroku
   end
 
   def self.has_gem_included?(project_path, gem_name)
-    gemfile = File.open(File.join(project_path, 'Gemfile'), 'a')
+    gemfile = File.open(File.join(project_path, "Gemfile"), "a")
 
     File.foreach(gemfile).any? do |line|
       line.match(/#{Regexp.quote(gem_name)}/)
@@ -30,10 +30,10 @@ class FakeHeroku
     app_name = "#{SuspendersTestHelpers::APP_NAME.dasherize}-#{environment}"
 
     command = if flags
-                "create #{app_name} #{flags} --remote #{environment}\n"
-              else
-                "create #{app_name} --remote #{environment}\n"
-              end
+      "create #{app_name} #{flags} --remote #{environment}\n"
+    else
+      "create #{app_name} --remote #{environment}\n"
+    end
 
     File.foreach(RECORDER).any? { |line| line == command }
   end

data/spec/support/project_files.rb

@@ -10,4 +10,16 @@ module ProjectFiles
     path = File.join(project_path, filename)
     FileUtils.rm_rf(path)
   end
+
+  def copy_file(from_in_templates, to_in_project)
+    destination = File.join(project_path, to_in_project)
+    destination_dirname = File.dirname(destination)
+
+    FileUtils.mkdir_p(destination_dirname)
+
+    FileUtils.cp(
+      File.join(root_path, "templates", from_in_templates),
+      destination
+    )
+  end
 end

data/spec/support/rails_template.rb

@@ -0,0 +1 @@
+gem "suspenders", path: File.expand_path("../..", __dir__)

data/spec/support/suspenders.rb

@@ -19,10 +19,7 @@ module SuspendersTestHelpers
       end
 
       Dir.chdir(APP_NAME) do
-        with_env("HOME", tmp_path) do
-          debug `git add .`
-          debug `git commit -m 'Initial commit'`
-        end
+        commit_all
       end
     end
   end
@@ -41,18 +38,11 @@ module SuspendersTestHelpers
       add_fakes_to_path
 
       with_revision_for_honeybadger do
-        debug `#{system_rails_bin} new #{APP_NAME}`
+        debug `#{system_rails_bin} new #{APP_NAME} -m #{rails_template_path}`
       end
 
       Dir.chdir(APP_NAME) do
-        File.open("Gemfile", "a") do |file|
-          file.puts %{gem "suspenders", path: #{root_path.inspect}}
-        end
-
-        with_env("HOME", tmp_path) do
-          debug `git add .`
-          debug `git commit -m 'Initial commit'`
-        end
+        commit_all
       end
     end
   end
@@ -98,7 +88,7 @@ module SuspendersTestHelpers
   end
 
   def add_fakes_to_path
-    ENV["PATH"] = "#{support_bin}:#{ENV['PATH']}"
+    ENV["PATH"] = "#{support_bin}:#{ENV["PATH"]}"
   end
 
   def project_path
@@ -116,7 +106,7 @@ module SuspendersTestHelpers
   end
 
   def suspenders_bin
-    File.join(root_path, 'bin', 'suspenders')
+    File.join(root_path, "bin", "suspenders")
   end
 
   def system_rails_bin
@@ -132,7 +122,20 @@ module SuspendersTestHelpers
   end
 
   def root_path
-    File.expand_path('../../../', __FILE__)
+    File.expand_path("../../../", __FILE__)
+  end
+
+  def rails_template_path
+    File.join(root_path, "spec", "support", "rails_template.rb")
+  end
+
+  def commit_all
+    with_env("HOME", tmp_path) do
+      debug `git config user.email suspenders@example.com`
+      debug `git config user.name "Suspenders Boy"`
+      debug `git add .`
+      debug `git commit -m 'Initial commit'`
+    end
   end
 
   def with_env(name, new_value)
@@ -141,7 +144,6 @@ module SuspendersTestHelpers
     ENV[name] = new_value.to_s
 
     yield
-
   ensure
     ENV.delete(name)
 
@@ -158,7 +160,7 @@ module SuspendersTestHelpers
 
   def run_in_tmp
     Dir.chdir(tmp_path) do
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         yield
       end
     end
@@ -166,7 +168,7 @@ module SuspendersTestHelpers
 
   def run_in_project
     Dir.chdir(project_path) do
-      Bundler.with_clean_env do
+      Bundler.with_unbundled_env do
         yield
       end
     end

data/suspenders.gemspec

@@ -1,35 +1,35 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
-require 'suspenders/version'
-require 'date'
+$:.push File.expand_path("../lib", __FILE__)
+require "suspenders/version"
+require "date"
 
 Gem::Specification.new do |s|
   s.required_ruby_version = ">= #{Suspenders::RUBY_VERSION}"
   s.required_rubygems_version = ">= 2.7.4"
-  s.authors = ['thoughtbot']
-  s.date = Date.today.strftime('%Y-%m-%d')
+  s.authors = ["thoughtbot"]
+  s.date = Date.today.strftime("%Y-%m-%d")
 
-  s.description = <<-HERE
-Suspenders is a base Rails project that you can upgrade. It is used by
-thoughtbot to get a jump start on a working app. Use Suspenders if you're in a
-rush to build something amazing; don't use it if you like missing deadlines.
+  s.description = <<~HERE
+    Suspenders is a base Rails project that you can upgrade. It is used by
+    thoughtbot to get a jump start on a working app. Use Suspenders if you're in a
+    rush to build something amazing; don't use it if you like missing deadlines.
   HERE
 
-  s.email = 'support@thoughtbot.com'
-  s.executables = ['suspenders']
+  s.email = "support@thoughtbot.com"
+  s.executables = ["suspenders"]
   s.extra_rdoc_files = %w[README.md LICENSE]
   s.files = `git ls-files`.split("\n")
-  s.homepage = 'http://github.com/thoughtbot/suspenders'
-  s.license = 'MIT'
-  s.name = 'suspenders'
-  s.rdoc_options = ['--charset=UTF-8']
-  s.require_paths = ['lib']
+  s.homepage = "http://github.com/thoughtbot/suspenders"
+  s.license = "MIT"
+  s.name = "suspenders"
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
   s.summary = "Generate a Rails app using thoughtbot's best practices."
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Suspenders::VERSION
 
-  s.add_dependency 'bitters', '~> 1.7'
-  s.add_dependency 'rails', Suspenders::RAILS_VERSION
+  s.add_dependency "bitters", ">= 2.0.4"
+  s.add_dependency "rails", Suspenders::RAILS_VERSION
 
-  s.add_development_dependency 'rspec', '~> 3.2'
+  s.add_development_dependency "rspec", "~> 3.2"
+  s.add_development_dependency "standard"
 end

data/templates/Gemfile.erb

@@ -10,6 +10,7 @@ ruby "<%= Suspenders::RUBY_VERSION %>"
 <% unless options[:api] %>
 gem "autoprefixer-rails"
 <% end %>
+gem "bootsnap", require: false
 gem "honeybadger"
 gem "pg"
 gem "puma"
@@ -18,26 +19,18 @@ gem "rails", "<%= Suspenders::RAILS_VERSION %>"
 gem "recipient_interceptor"
 gem "sassc-rails"
 gem "skylight"
-gem "sprockets", ">= 3.0.0"
+gem "sprockets", "< 4"
 gem "title"
 gem "tzinfo-data", platforms: [:mingw, :x64_mingw, :mswin, :jruby]
-gem "uglifier"
-gem "bootsnap", require: false
-<% if options[:webpack] %>
 gem "webpacker"
-<% end %>
 
 group :development do
   gem "listen"
-  gem "rack-mini-profiler", require: false
-  gem "spring"
   gem "web-console"
 end
 
 group :development, :test do
   gem "awesome_print"
-  gem "bundler-audit", ">= 0.5.0", require: false
-  gem "dotenv-rails"
   gem "pry-byebug"
   gem "pry-rails"
 end
@@ -45,7 +38,6 @@ end
 group :test do
   gem "formulaic"
   gem "launchy"
-  gem "simplecov", require: false
   gem "timecop"
   gem "webmock"
 end

data/templates/_javascript.html.erb

@@ -1,3 +1,3 @@
-<%= javascript_include_tag :application %>
+<%= javascript_pack_tag :application %>
 
 <%= yield :javascript %>

data/templates/application.scss

@@ -3,6 +3,5 @@
 @import "normalize.css/normalize";
 
 @import "bourbon";
-@import "neat";
 
 @import "base/base";

data/templates/bin_auto_migrate

@@ -0,0 +1,5 @@
+ set -e
+
+ if [ -n "$AUTO_MIGRATE_DB" ]; then
+   bundle exec rake db:migrate
+ fi

data/templates/bin_deploy

@@ -8,5 +8,3 @@ branch="$(git symbolic-ref HEAD --short)"
 target="${1:-staging}"
 
 git push "$target" "$branch:master"
-heroku run rails db:migrate --exit-code --remote "$target"
-heroku restart --remote "$target"

data/templates/bin_setup

@@ -24,5 +24,5 @@ if [ ! -d .git/safe ] && echo $PATH | grep .git/safe > /dev/null; then
 fi
 
 # Only if this isn't CI
-# if [ -z "$CI" ]; then
-# fi
+if [ -z "$CI" ]; then
+fi

data/templates/bin_setup_review_app.erb

@@ -17,6 +17,5 @@ heroku pg:backups:capture --app $PARENT_APP_NAME
 URL=`heroku pg:backups public-url --app $PARENT_APP_NAME`
 
 heroku pg:backups restore $URL DATABASE_URL --confirm $APP_NAME --app $APP_NAME
-heroku run rails db:migrate --exit-code --app $APP_NAME
 heroku ps:scale worker=1 --app $APP_NAME
 heroku restart --app $APP_NAME

data/templates/capybara_silence_puma.rb

@@ -0,0 +1 @@
+Capybara.server = :puma, {Silent: true}

data/templates/chromedriver.rb

@@ -5,13 +5,23 @@ Capybara.register_driver :chrome do |app|
 end
 
 Capybara.register_driver :headless_chrome do |app|
-  capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(
-    chromeOptions: { args: %w(headless disable-gpu) },
-  )
+  options = ::Selenium::WebDriver::Chrome::Options.new
+  options.headless!
+  options.add_argument "--window-size=1680,1050"
 
   Capybara::Selenium::Driver.new app,
     browser: :chrome,
-    desired_capabilities: capabilities
+    options: options
 end
 
 Capybara.javascript_driver = :headless_chrome
+
+RSpec.configure do |config|
+  config.before(:each, type: :system) do
+    driven_by :rack_test
+  end
+
+  config.before(:each, type: :system, js: true) do
+    driven_by Capybara.javascript_driver
+  end
+end