Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb')
-rw-r--r--qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb60
1 files changed, 28 insertions, 32 deletions
diff --git a/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb b/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb
index 3e1e2bc5b5b..944f40b61f6 100644
--- a/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb
+++ b/qa/qa/specs/features/browser_ui/4_verify/pipeline/merge_mr_when_pipline_is_blocked_spec.rb
@@ -18,43 +18,39 @@ module QA
end
let!(:ci_file) do
- Resource::Repository::Commit.fabricate_via_api! do |commit|
- commit.project = project
- commit.commit_message = 'Add .gitlab-ci.yml'
- commit.add_files(
- [
- file_path: '.gitlab-ci.yml',
- content: <<~YAML
- test_blocked_pipeline:
- stage: build
- tags: [#{executor}]
- script: echo 'OK!'
+ create(:commit, project: project, commit_message: 'Add .gitlab-ci.yml', actions: [
+ {
+ action: 'create',
+ file_path: '.gitlab-ci.yml',
+ content: <<~YAML
+ test_blocked_pipeline:
+ stage: build
+ tags: [#{executor}]
+ script: echo 'OK!'
- manual_job:
- stage: test
- needs: [test_blocked_pipeline]
- script: echo do not click me
- when: manual
- allow_failure: false
+ manual_job:
+ stage: test
+ needs: [test_blocked_pipeline]
+ script: echo do not click me
+ when: manual
+ allow_failure: false
- dummy_job:
- stage: deploy
- needs: [manual_job]
- script: echo nothing
- YAML
- ]
- )
- end
+ dummy_job:
+ stage: deploy
+ needs: [manual_job]
+ script: echo nothing
+ YAML
+ }
+ ])
end
let(:merge_request) do
- Resource::MergeRequest.fabricate_via_api! do |merge_request|
- merge_request.project = project
- merge_request.description = Faker::Lorem.sentence
- merge_request.target_new_branch = false
- merge_request.file_name = 'custom_file.txt'
- merge_request.file_content = Faker::Lorem.sentence
- end
+ create(:merge_request,
+ project: project,
+ description: Faker::Lorem.sentence,
+ target_new_branch: false,
+ file_name: 'custom_file.txt',
+ file_content: Faker::Lorem.sentence)
end
before do