Merge pull request #3964 from keepcosmos/add-s3-region

Add new s3 region
This commit is contained in:
Régis Hanol 2016-01-19 09:16:48 +01:00
commit 522e0dc9ca
2 changed files with 2 additions and 1 deletions

View file

@ -19,6 +19,7 @@ class S3RegionSiteSetting < EnumSiteSetting
'ap-southeast-1', 'ap-southeast-1',
'ap-southeast-2', 'ap-southeast-2',
'ap-northeast-1', 'ap-northeast-1',
'ap-northeast-2',
'sa-east-1'] 'sa-east-1']
end end

View file

@ -14,7 +14,7 @@ describe S3RegionSiteSetting do
describe 'values' do describe 'values' do
it 'returns all the S3 regions' do it 'returns all the S3 regions' do
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', 'eu-central-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', 'eu-central-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'ap-northeast-2', 'sa-east-1'].sort)
end end
end end