diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-05 17:31:56 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-05 17:31:56 -0600 |
| commit | 03aeab857f0972e74910307f1a5954353eb70a28 (patch) | |
| tree | b0b6243ee40684a949cff440bb56dcad7eec8674 /spec/rails_helper.rb | |
| parent | f441770e50621ac59a7b022ee2127964935b2b8d (diff) | |
| parent | f6adb409fd8f4bf42c1da54cc1e7e42886612c14 (diff) | |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-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 4f7399505..67c6b9205 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 = ENV['LOCAL_HTTPS'] == 'true' + https = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true' Capybara.app_host = "http#{https ? 's' : ''}://#{ENV.fetch('LOCAL_DOMAIN')}" end |