Remove method call to deprecated method

Given the settings initializer creates Gitaly Storage Settings objects
already, the calls to path can be moved to that initializer.

2 files changed, 29 insertions, 20 deletions

diff --git a/spec/initializers/6_validations_spec.rb b/spec/initializers/6_validations_spec.rb
index 1dc307ea922..8d9dc092547 100644
--- a/spec/initializers/6_validations_spec.rb
+++ b/spec/initializers/6_validations_spec.rb
@@ -42,26 +42,6 @@ describe '6_validations' do
         expect { validate_storages_config }.to raise_error('"name with spaces" is not a valid storage name. Please fix this in your gitlab.yml before starting GitLab.')
       end
     end
-
-    context 'with incomplete settings' do
-      before do
-        mock_storages('foo' => {})
-      end
-
-      it 'throws an error suggesting the user to update its settings' do
-        expect { validate_storages_config }.to raise_error('foo is not a valid storage, because it has no `path` key. Refer to gitlab.yml.example for an updated example. Please fix this in your gitlab.yml before starting GitLab.')
-      end
-    end
-
-    context 'with deprecated settings structure' do
-      before do
-        mock_storages('foo' => 'tmp/tests/paths/a/b/c')
-      end
-
-      it 'throws an error suggesting the user to update its settings' do
-        expect { validate_storages_config }.to raise_error("foo is not a valid storage, because it has no `path` key. It may be configured as:\n\nfoo:\n  path: tmp/tests/paths/a/b/c\n\nFor source installations, update your config/gitlab.yml Refer to gitlab.yml.example for an updated example.\n\nIf you're using the Gitlab Development Kit, you can update your configuration running `gdk reconfigure`.\n")
-      end
-    end
   end
 
   describe 'validate_storages_paths' do
diff --git a/spec/lib/gitlab/gitaly_client/storage_settings_spec.rb b/spec/lib/gitlab/gitaly_client/storage_settings_spec.rb
new file mode 100644
index 00000000000..c89913ec8e9
--- /dev/null
+++ b/spec/lib/gitlab/gitaly_client/storage_settings_spec.rb
@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Gitlab::GitalyClient::StorageSettings do
+  describe "#initialize" do
+    context 'when the storage contains no path' do
+      it 'raises an error' do
+        expect do
+          described_class.new("foo" => {})
+        end.to raise_error(described_class::InvalidConfigurationError)
+      end
+    end
+
+    context "when the argument isn't a hash" do
+      it 'raises an error' do
+        expect do
+          described_class.new("test")
+        end.to raise_error("expected a Hash, got a String")
+      end
+    end
+
+    context 'when the storage is valid' do
+      it 'raises no error' do
+        expect do
+          described_class.new("path" => Rails.root)
+        end.not_to raise_error
+      end
+    end
+  end
+end