diff options
author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-07-12 04:29:13 +0300 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2016-07-22 01:29:56 +0300 |
commit | 72f59ddf4c9d276bd565892c0cf79d5622906090 (patch) | |
tree | db30cc7f119c80677985a096019f42ab40448237 /spec/initializers/6_validations_spec.rb | |
parent | d2598f6273d4a714134c26ee520b99a40579e8fa (diff) |
Use Pathname to make the repository storage path validations more robust
Diffstat (limited to 'spec/initializers/6_validations_spec.rb')
-rw-r--r-- | spec/initializers/6_validations_spec.rb | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/spec/initializers/6_validations_spec.rb b/spec/initializers/6_validations_spec.rb index 5178bd130f4..05d0aa63488 100644 --- a/spec/initializers/6_validations_spec.rb +++ b/spec/initializers/6_validations_spec.rb @@ -1,9 +1,19 @@ require 'spec_helper' describe '6_validations', lib: true do + before :all do + FileUtils.mkdir_p('tmp/tests/paths/a/b/c/d') + FileUtils.mkdir_p('tmp/tests/paths/a/b/c2') + FileUtils.mkdir_p('tmp/tests/paths/a/b/d') + end + + after :all do + FileUtils.rm_rf('tmp/tests/paths') + end + context 'with correct settings' do before do - mock_storages('foo' => '/a/b/c', 'bar' => 'a/b/d') + mock_storages('foo' => 'tmp/tests/paths/a/b/c', 'bar' => 'tmp/tests/paths/a/b/d') end it 'passes through' do @@ -13,7 +23,7 @@ describe '6_validations', lib: true do context 'with invalid storage names' do before do - mock_storages('name with spaces' => '/a/b/c') + mock_storages('name with spaces' => 'tmp/tests/paths/a/b/c') end it 'throws an error' do @@ -23,7 +33,7 @@ describe '6_validations', lib: true do context 'with nested storage paths' do before do - mock_storages('foo' => '/a/b/c', 'bar' => '/a/b/c/d') + mock_storages('foo' => 'tmp/tests/paths/a/b/c', 'bar' => 'tmp/tests/paths/a/b/c/d') end it 'throws an error' do @@ -31,6 +41,16 @@ describe '6_validations', lib: true do end end + context 'with similar but un-nested storage paths' do + before do + mock_storages('foo' => 'tmp/tests/paths/a/b/c', 'bar' => 'tmp/tests/paths/a/b/c2') + end + + it 'passes through' do + expect { load_validations }.not_to raise_error + end + end + def mock_storages(storages) allow(Gitlab.config.repositories).to receive(:storages).and_return(storages) end |