Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-05 22:17:12 +00:00
parent f41b33eb01 10f6793fd0
commit f6adb409fd
14 changed files with 69 additions and 10 deletions
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -46,7 +46,7 @@ RSpec.configure do |config|
  config.include ActiveSupport::Testing::TimeHelpers

  config.before :each, type: :feature do
-    https = ENV['LOCAL_HTTPS'] == 'true'
+    https = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'
    Capybara.app_host = "http#{https ? 's' : ''}://#{ENV.fetch('LOCAL_DOMAIN')}"
  end