Commit 5b52da9c authored by Kamil Trzcinski's avatar Kamil Trzcinski

Revert unrelevant changes

parent 7cdb5173
......@@ -250,8 +250,9 @@ def update_duration
end
def execute_hooks
project.execute_hooks(pipeline_data, :pipeline_hooks)
project.execute_services(pipeline_data, :pipeline_hooks)
data = pipeline_data
project.execute_hooks(data, :pipeline_hooks)
project.execute_services(data, :pipeline_hooks)
end
private
......
......@@ -39,8 +39,7 @@
describe '#preload_max_access_for_authors' do
before do
# #preload_max_access_for_authors would read cache from RequestStore,
# so we should make sure it's clean.
# This method reads cache from RequestStore, so make sure it's clean.
RequestStore.clear!
end
......
......@@ -275,8 +275,7 @@
context 'when yaml_variables are undefined' do
before do
build.update(yaml_variables: nil)
build.reload # reload pipeline so that it resets config_processor
build.yaml_variables = nil
end
context 'use from gitlab-ci.yml' do
......@@ -424,24 +423,22 @@
describe '#stuck?' do
subject { build.stuck? }
%w[pending].each do |state|
context "when commit_status.status is #{state}" do
before do
build.status = state
end
it { is_expected.to be_truthy }
context "when commit_status.status is pending" do
before do
build.status = 'pending'
end
context "and there are specific runner" do
let(:runner) { create(:ci_runner, contacted_at: 1.second.ago) }
it { is_expected.to be_truthy }
before do
build.project.runners << runner
runner.save
end
context "and there are specific runner" do
let(:runner) { create(:ci_runner, contacted_at: 1.second.ago) }
it { is_expected.to be_falsey }
before do
build.project.runners << runner
runner.save
end
it { is_expected.to be_falsey }
end
end
......@@ -904,8 +901,7 @@ def create_mr(build, pipeline, factory: :merge_request, created_at: Time.now)
context 'when `when` is undefined' do
before do
build.update(when: nil)
build.reload # reload pipeline so that it resets config_processor
build.when = nil
end
context 'use from gitlab-ci.yml' 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