diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-01-07 13:30:52 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-01-07 13:30:52 -0600 |
| commit | f7c4d4464ba3b3729d707c54c4d2aa7515a9fe57 (patch) | |
| tree | b9dff90611207ec3dd075ca73fac32896dbab292 /spec/rails_helper.rb | |
| parent | 70c99a9f34b645baa65982dfec5351869c1924fe (diff) | |
| parent | c2e1bfd9ae3f5fe65c4918a37143d48a2cc12bb3 (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 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 |