Simplify implementation of build artifacts browser (refactoring)

2 files changed, 10 insertions, 58 deletions

diff --git a/spec/lib/gitlab/string_path_spec.rb b/spec/lib/gitlab/ci/build/artifacts/metadata/path_spec.rb
index 7f1d111478b..148d05b5902 100644
--- a/spec/lib/gitlab/string_path_spec.rb
+++ b/spec/lib/gitlab/ci/build/artifacts/metadata/path_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Gitlab::StringPath do
+describe Gitlab::Ci::Build::Artifacts::Metadata::Path do
   let(:universe) do
     ['path/',
      'path/dir_1/',
@@ -27,30 +27,19 @@ describe Gitlab::StringPath do
   describe '/file/with/absolute_path', path: '/file/with/absolute_path' do
     subject { |example| path(example) }
 
-    it { is_expected.to be_absolute } 
-    it { is_expected.to_not be_relative }
     it { is_expected.to be_file }
     it { is_expected.to have_parent }
-    it { is_expected.to_not have_descendants }
-    it { is_expected.to exist }
 
     describe '#basename' do
       subject { |example| path(example).basename }
-
       it { is_expected.to eq 'absolute_path' }
     end
   end
 
-  describe 'path/', path: 'path/' do
-    subject { |example| path(example) }
-
-    it { is_expected.to be_directory }
-    it { is_expected.to be_relative }
-  end
-
   describe 'path/dir_1/', path: 'path/dir_1/' do
     subject { |example| path(example) }
     it { is_expected.to have_parent }
+    it { is_expected.to be_directory }
 
     describe '#basename' do
       subject { |example| path(example).basename }
@@ -67,19 +56,6 @@ describe Gitlab::StringPath do
       it { is_expected.to eq string_path('path/') }
     end
 
-    describe '#descendants' do
-      subject { |example| path(example).descendants }
-
-      it { is_expected.to be_an_instance_of Array }
-      it { is_expected.to all(be_an_instance_of described_class) }
-      it do
-        is_expected.to contain_exactly string_path('path/dir_1/file_1'),
-                                       string_path('path/dir_1/file_b'),
-                                       string_path('path/dir_1/subdir/'),
-                                       string_path('path/dir_1/subdir/subfile')
-      end
-    end
-
     describe '#children' do
       subject { |example| path(example).children }
 
@@ -117,23 +93,14 @@ describe Gitlab::StringPath do
       it { is_expected.to all(be_an_instance_of described_class) }
       it do
         is_expected.to contain_exactly string_path('path/dir_1/subdir/'),
-                                       string_path('path/dir_1/../')
+                                       string_path('path/')
       end
     end
   end
 
-  describe './', path: './' do
+  describe 'empty path', path: '' do
     subject { |example| path(example) }
-
     it { is_expected.to_not have_parent }
-    it { is_expected.to have_descendants }
-
-    describe '#descendants' do
-      subject { |example| path(example).descendants }
-
-      it { expect(subject.count).to eq universe.count - 1 }
-      it { is_expected.to_not include string_path('./') }
-    end
 
     describe '#children' do
       subject { |example| path(example).children }
@@ -141,11 +108,6 @@ describe Gitlab::StringPath do
     end
   end
 
-  describe '#nodes', path: './' do
-    subject { |example| path(example).nodes }
-    it { is_expected.to eq 1 }
-  end
-
   describe '#nodes', path: './test' do
     subject { |example| path(example).nodes }
     it { is_expected.to eq 2 }
diff --git a/spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb b/spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb
index 0c8a41cfab7..36c4851126c 100644
--- a/spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb
+++ b/spec/lib/gitlab/ci/build/artifacts/metadata_spec.rb
@@ -10,13 +10,8 @@ describe Gitlab::Ci::Build::Artifacts::Metadata do
   end
 
   context 'metadata file exists' do
-    describe '#exists?' do
-      subject { metadata.exists? }
-      it { is_expected.to be true }
-    end
-
-    describe '#match! ./' do
-      subject { metadata('./').match! }
+    describe '#match! empty string' do
+      subject { metadata('').match! }
 
       it 'matches correct paths' do
         expect(subject.first).to contain_exactly 'ci_artifacts.txt',
@@ -55,9 +50,9 @@ describe Gitlab::Ci::Build::Artifacts::Metadata do
       end
     end
 
-    describe '#to_string_path' do
-      subject { metadata('').to_string_path }
-      it { is_expected.to be_an_instance_of(Gitlab::StringPath) }
+    describe '#to_path' do
+      subject { metadata('').to_path }
+      it { is_expected.to be_an_instance_of(Gitlab::Ci::Build::Artifacts::Metdata::Path) }
     end
 
     describe '#full_version' do
@@ -79,14 +74,9 @@ describe Gitlab::Ci::Build::Artifacts::Metadata do
   context 'metadata file does not exist' do
     let(:metadata_file_path) { '' }
 
-    describe '#exists?' do
-      subject { metadata.exists? }
-      it { is_expected.to be false }
-    end
-
     describe '#match!' do
       it 'raises error' do
-        expect { metadata.match! }.to raise_error(StandardError, /Metadata file not found/)
+        expect { metadata.match! }.to raise_error(Errno::ENOENT)
       end
     end
   end