From 38202d5037343ab8e407e2f9fe34e4cfff0b5954 Mon Sep 17 00:00:00 2001 From: "Jonathan Richard Henry Evans (JRHE)" Date: Mon, 15 Sep 2014 19:34:12 +0100 Subject: [PATCH] Adds govcloud region to s3 region list --- app/models/s3_region_site_setting.rb | 3 ++- spec/models/s3_region_site_setting_spec.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/s3_region_site_setting.rb b/app/models/s3_region_site_setting.rb index 993ba1ad6f1..9b2ec0ce81c 100644 --- a/app/models/s3_region_site_setting.rb +++ b/app/models/s3_region_site_setting.rb @@ -14,10 +14,11 @@ class S3RegionSiteSetting < EnumSiteSetting 'us-east-1', 'us-west-1', 'us-west-2', + 'us-gov-west-1', 'eu-west-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', - 'sa-east-1' ] + 'sa-east-1'] end end diff --git a/spec/models/s3_region_site_setting_spec.rb b/spec/models/s3_region_site_setting_spec.rb index 506f9d0db02..f2743e16693 100644 --- a/spec/models/s3_region_site_setting_spec.rb +++ b/spec/models/s3_region_site_setting_spec.rb @@ -14,7 +14,7 @@ describe S3RegionSiteSetting do describe 'values' do it 'returns all the S3 regions and blank' do - expect(S3RegionSiteSetting.values.map {|x| x[:value]}.sort).to eq(['', 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1'].sort) + expect(S3RegionSiteSetting.values.map {|x| x[:value]}.sort).to eq(['', 'us-east-1', 'us-west-1', 'us-west-2', 'us-gov-west-1', 'eu-west-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1'].sort) end end