Merge remote-tracking branch 'origin/master' into 40781-os-to-ce

3 files changed, 59 insertions, 31 deletions

diff --git a/spec/tasks/gitlab/check_rake_spec.rb b/spec/tasks/gitlab/check_rake_spec.rb
index 538ff952bf4..4eda618b6d6 100644
--- a/spec/tasks/gitlab/check_rake_spec.rb
+++ b/spec/tasks/gitlab/check_rake_spec.rb
@@ -11,8 +11,8 @@ describe 'gitlab:ldap:check rake task' do
 
   context 'when LDAP is not enabled' do
     it 'does not attempt to bind or search for users' do
-      expect(Gitlab::LDAP::Config).not_to receive(:providers)
-      expect(Gitlab::LDAP::Adapter).not_to receive(:open)
+      expect(Gitlab::Auth::LDAP::Config).not_to receive(:providers)
+      expect(Gitlab::Auth::LDAP::Adapter).not_to receive(:open)
 
       run_rake_task('gitlab:ldap:check')
     end
@@ -23,12 +23,12 @@ describe 'gitlab:ldap:check rake task' do
     let(:adapter) { ldap_adapter('ldapmain', ldap) }
 
     before do
-      allow(Gitlab::LDAP::Config)
+      allow(Gitlab::Auth::LDAP::Config)
         .to receive_messages(
           enabled?: true,
           providers: ['ldapmain']
         )
-      allow(Gitlab::LDAP::Adapter).to receive(:open).and_yield(adapter)
+      allow(Gitlab::Auth::LDAP::Adapter).to receive(:open).and_yield(adapter)
       allow(adapter).to receive(:users).and_return([])
     end
 
diff --git a/spec/tasks/gitlab/traces_rake_spec.rb b/spec/tasks/gitlab/traces_rake_spec.rb
new file mode 100644
index 00000000000..bd18e8ffc1e
--- /dev/null
+++ b/spec/tasks/gitlab/traces_rake_spec.rb
@@ -0,0 +1,55 @@
+require 'rake_helper'
+
+describe 'gitlab:traces rake tasks' do
+  before do
+    Rake.application.rake_require 'tasks/gitlab/traces'
+  end
+
+  shared_examples 'passes the job id to worker' do
+    it do
+      expect(ArchiveTraceWorker).to receive(:bulk_perform_async).with([[job.id]])
+
+      run_rake_task('gitlab:traces:archive')
+    end
+  end
+
+  shared_examples 'does not pass the job id to worker' do
+    it do
+      expect(ArchiveTraceWorker).not_to receive(:bulk_perform_async)
+
+      run_rake_task('gitlab:traces:archive')
+    end
+  end
+
+  context 'when trace file stored in default path' do
+    let!(:job) { create(:ci_build, :success, :trace_live) }
+
+    it_behaves_like 'passes the job id to worker'
+  end
+
+  context 'when trace is stored in database' do
+    let!(:job) { create(:ci_build, :success) }
+
+    before do
+      job.update_column(:trace, 'trace in db')
+    end
+
+    it_behaves_like 'passes the job id to worker'
+  end
+
+  context 'when job has trace artifact' do
+    let!(:job) { create(:ci_build, :success) }
+
+    before do
+      create(:ci_job_artifact, :trace, job: job)
+    end
+
+    it_behaves_like 'does not pass the job id to worker'
+  end
+
+  context 'when job is not finished yet' do
+    let!(:build) { create(:ci_build, :running, :trace_live) }
+
+    it_behaves_like 'does not pass the job id to worker'
+  end
+end
diff --git a/spec/tasks/gitlab/uploads_rake_spec.rb b/spec/tasks/gitlab/uploads_rake_spec.rb
deleted file mode 100644
index ac0005e51e0..00000000000
--- a/spec/tasks/gitlab/uploads_rake_spec.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'rake_helper'
-
-describe 'gitlab:uploads rake tasks' do
-  describe 'check' do
-    let!(:upload) { create(:upload, path: Rails.root.join('spec/fixtures/banana_sample.gif')) }
-
-    before do
-      Rake.application.rake_require 'tasks/gitlab/uploads'
-    end
-
-    it 'outputs the integrity check for each uploaded file' do
-      expect { run_rake_task('gitlab:uploads:check') }.to output(/Checking file \(#{upload.id}\): #{Regexp.quote(upload.absolute_path)}/).to_stdout
-    end
-
-    it 'errors out about missing files on the file system' do
-      create(:upload)
-
-      expect { run_rake_task('gitlab:uploads:check') }.to output(/File does not exist on the file system/).to_stdout
-    end
-
-    it 'errors out about invalid checksum' do
-      upload.update_column(:checksum, '01a3156db2cf4f67ec823680b40b7302f89ab39179124ad219f94919b8a1769e')
-
-      expect { run_rake_task('gitlab:uploads:check') }.to output(/File checksum \(9e697aa09fe196909813ee36103e34f721fe47a5fdc8aac0e4e4ac47b9b38282\) does not match the one in the database \(#{upload.checksum}\)/).to_stdout
-    end
-  end
-end