diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-07 15:17:13 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-07 15:17:13 +0000 |
commit | c2e1bfd9ae3f5fe65c4918a37143d48a2cc12bb3 (patch) | |
tree | eb2c9fd328b985d7d388e4a6f9543e0a1180a9e8 /spec/rails_helper.rb | |
parent | 5083311d64f427771609e444b87c0c39cb6f8ac2 (diff) | |
parent | 1d92b90be9f494d90a6f79f53be9cca68562867e (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'spec/rails_helper.rb')
-rw-r--r-- | spec/rails_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 67c6b9205..4f7399505 100644 --- 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 = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true' + https = ENV['LOCAL_HTTPS'] == 'true' Capybara.app_host = "http#{https ? 's' : ''}://#{ENV.fetch('LOCAL_DOMAIN')}" end |