From d261f83626b9abde93f91d9850ae3e989348e12d Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Mon, 1 May 2017 20:15:16 +0000
Subject: Update Carrierwave and fog-core

---
 spec/factories/projects.rb                                |  4 ++++
 spec/models/project_spec.rb                               | 15 ++++++---------
 .../expire_build_instance_artifacts_worker_spec.rb        |  6 ++++--
 3 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'spec')

diff --git a/spec/factories/projects.rb b/spec/factories/projects.rb
index 0db2fe04edd..3580752a805 100644
--- a/spec/factories/projects.rb
+++ b/spec/factories/projects.rb
@@ -32,6 +32,10 @@ FactoryGirl.define do
       request_access_enabled true
     end
 
+    trait :with_avatar do
+      avatar { File.open(Rails.root.join('spec/fixtures/dk.png')) }
+    end
+
     trait :repository do
       # no-op... for now!
     end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 92d420337f9..d9244657953 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -781,17 +781,14 @@ describe Project, models: true do
 
     let(:project) { create(:empty_project) }
 
-    context 'When avatar file is uploaded' do
-      before do
-        project.update_columns(avatar: 'uploads/avatar.png')
-        allow(project.avatar).to receive(:present?) { true }
-      end
+    context 'when avatar file is uploaded' do
+      let(:project) { create(:empty_project, :with_avatar) }
 
-      let(:avatar_path) do
-        "/uploads/project/avatar/#{project.id}/uploads/avatar.png"
-      end
+      it 'creates a correct avatar path' do
+        avatar_path = "/uploads/project/avatar/#{project.id}/dk.png"
 
-      it { should eq "http://#{Gitlab.config.gitlab.host}#{avatar_path}" }
+        expect(project.avatar_url).to eq("http://#{Gitlab.config.gitlab.host}#{avatar_path}")
+      end
     end
 
     context 'When avatar file in git' do
diff --git a/spec/workers/expire_build_instance_artifacts_worker_spec.rb b/spec/workers/expire_build_instance_artifacts_worker_spec.rb
index d202b3de77e..1d8da68883b 100644
--- a/spec/workers/expire_build_instance_artifacts_worker_spec.rb
+++ b/spec/workers/expire_build_instance_artifacts_worker_spec.rb
@@ -34,12 +34,14 @@ describe ExpireBuildInstanceArtifactsWorker do
       context 'when associated project was removed' do
         let(:build) do
           create(:ci_build, :artifacts, artifacts_expiry) do |build|
-            build.project.delete
+            build.project.pending_delete = true
           end
         end
 
         it 'does not remove artifacts' do
-          expect(build.reload.artifacts_file.exists?).to be_truthy
+          expect do
+            build.reload.artifacts_file
+          end.not_to raise_error
         end
       end
     end
-- 
cgit v1.2.3