diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-07 16:55:03 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-07 16:55:03 +0000 |
commit | a5db7f54252d22e3ecd49786a3fdff7c46658fa3 (patch) | |
tree | 71a947d3274aadf2a2896166a6709174b910a2d0 /spec/models/project_spec.rb | |
parent | ba3ce6bd39ffdcc03c1b435c8c69ddfc4ff688e2 (diff) | |
parent | 0b9d56f960e272047ac749cff7a29f2b5f03f7a5 (diff) | |
download | gitlab-ce-a5db7f54252d22e3ecd49786a3fdff7c46658fa3.tar.gz |
Merge branch '28447-hybrid-repository-storages' into 'master'
Update storage settings to allow extra values per shard
See merge request !9597
Diffstat (limited to 'spec/models/project_spec.rb')
-rw-r--r-- | spec/models/project_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 84bdcbe8e59..e120e21af06 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -179,7 +179,7 @@ describe Project, models: true do let(:project2) { build(:empty_project, repository_storage: 'missing') } before do - storages = { 'custom' => 'tmp/tests/custom_repositories' } + storages = { 'custom' => { 'path' => 'tmp/tests/custom_repositories' } } allow(Gitlab.config.repositories).to receive(:storages).and_return(storages) end @@ -381,7 +381,7 @@ describe Project, models: true do before do FileUtils.mkdir('tmp/tests/custom_repositories') - storages = { 'custom' => 'tmp/tests/custom_repositories' } + storages = { 'custom' => { 'path' => 'tmp/tests/custom_repositories' } } allow(Gitlab.config.repositories).to receive(:storages).and_return(storages) end @@ -947,8 +947,8 @@ describe Project, models: true do before do storages = { - 'default' => 'tmp/tests/repositories', - 'picked' => 'tmp/tests/repositories', + 'default' => { 'path' => 'tmp/tests/repositories' }, + 'picked' => { 'path' => 'tmp/tests/repositories' }, } allow(Gitlab.config.repositories).to receive(:storages).and_return(storages) end |