Commit 6827e068 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg Committed by Kamil Trzcinski
Browse files

Remove hook set by carrierwave too

parent fdce8c8cb40f
......@@ -6,7 +6,6 @@ class JobArtifact < ActiveRecord::Base
belongs_to :job, class_name: "Ci::Build", foreign_key: :job_id
before_save :set_size, if: :file_changed?
after_commit :remove_file!, on: :destroy
mount_uploader :file, JobArtifactUploader
......
......@@ -1018,9 +1018,9 @@
describe '#merge_request' do
def create_mr(build, pipeline, factory: :merge_request, created_at: Time.now)
create(factory, source_project: pipeline.project,
target_project: pipeline.project,
source_branch: build.ref,
created_at: created_at)
target_project: pipeline.project,
source_branch: build.ref,
created_at: created_at)
end
context 'when a MR has a reference to the pipeline' do
......@@ -1319,7 +1319,7 @@ def create_mr(build, pipeline, factory: :merge_request, created_at: Time.now)
context 'when `when` is undefined' do
before do
build.when = nil
end
end
context 'use from gitlab-ci.yml' do
let(:pipeline) { create(:ci_pipeline) }
......@@ -1360,7 +1360,7 @@ def create_mr(build, pipeline, factory: :merge_request, created_at: Time.now)
end
end
end
end
end
describe '#variables' do
let(:container_registry_enabled) { false }
......@@ -1463,7 +1463,7 @@ def create_mr(build, pipeline, factory: :merge_request, created_at: Time.now)
before do
environment_variables <<
{ key: 'CI_ENVIRONMENT_URL', value: url, public: true }
{ key: 'CI_ENVIRONMENT_URL', value: url, public: true }
end
context 'when the URL was set from the job' do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment