Skip to content

Commit 7015df2

Browse files
committed
KBP-138 #time 1.5h - added ssl control staging and production
1 parent 5abb135 commit 7015df2

File tree

5 files changed

+29
-0
lines changed

5 files changed

+29
-0
lines changed

lib/cybele/app_builder.rb

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ def add_gems
3232
append_file('Gemfile', template_content('Gemfile.erb'))
3333
end
3434

35+
def force_ssl_setting
36+
gsub_file 'config/environments/production.rb',
37+
/# config.force_ssl = true/, "config.force_ssl = ENV['RAILS_FORCE_SSL'].present?"
38+
gsub_file 'config/environments/staging.rb',
39+
/# config.force_ssl = true/, "config.force_ssl = ENV['RAILS_FORCE_SSL'].present?"
40+
end
41+
3542
def add_editor_config
3643
copy_file 'editorconfig', '.editorconfig'
3744
end

lib/cybele/generators/app_generator.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,11 @@ def setup_bullet_config
187187
build :configure_bullet
188188
end
189189

190+
def force_ssl
191+
say 'Add ssl control into staging.rb and production.rb', :green
192+
build :force_ssl_setting
193+
end
194+
190195
def setup_paperclip_and_add_aws
191196
say 'Setting up paperclip, editing settings.yml and env files', :green
192197
build :configure_paperclip

spec/features/new_default_project_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,4 +207,8 @@
207207
it 'uses devise' do
208208
devise_test_helper
209209
end
210+
211+
it 'uses ssl_setting' do
212+
force_ssl
213+
end
210214
end

spec/features/new_not_default_project_spec.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,4 +187,8 @@
187187
it 'uses devise' do
188188
devise_test_helper
189189
end
190+
191+
it 'uses ssl_setting' do
192+
force_ssl
193+
end
190194
end

spec/support/gem_test_helpers.rb

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,4 +145,13 @@ def config_test_helper
145145
config_test_file = content('config/environments/test.rb')
146146
expect(config_test_file).to match(/^Rails.application.configure/)
147147
end
148+
149+
def force_ssl
150+
config_staging_file = content('config/environments/staging.rb')
151+
expect(config_staging_file).to match('config.force_ssl')
152+
153+
config_production_file = content('config/environments/staging.rb')
154+
expect(config_production_file).to match('config.force_ssl')
155+
end
156+
148157
end

0 commit comments

Comments
 (0)