From f321e51f46bcb628c3e96a44b5ebf3bb1c4033ab Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 3 Mar 2020 06:07:59 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../browser_ui/3_create/merge_request/rebase_merge_request_spec.rb | 2 +- .../browser_ui/3_create/merge_request/squash_merge_request_spec.rb | 2 +- .../browser_ui/3_create/repository/add_list_delete_branches_spec.rb | 2 +- .../browser_ui/3_create/repository/protocol_v2_push_http_spec.rb | 2 +- .../browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb | 2 +- .../browser_ui/3_create/repository/push_mirroring_over_http_spec.rb | 2 +- .../features/browser_ui/3_create/repository/push_over_http_spec.rb | 5 ++--- .../browser_ui/3_create/repository/push_protected_branch_spec.rb | 2 +- .../features/browser_ui/3_create/repository/use_ssh_key_spec.rb | 6 ++---- .../browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb | 2 +- 10 files changed, 12 insertions(+), 15 deletions(-) (limited to 'qa') diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb index 6ebe3e0b620..1c78deae2bf 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/rebase_merge_request_spec.rb @@ -6,7 +6,7 @@ module QA it 'user rebases source branch of merge request' do Flow::Login.sign_in - project = Resource::Project.fabricate! do |project| + project = Resource::Project.fabricate_via_api! do |project| project.name = "only-fast-forward" end project.visit! diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb index 89f0fc37f3f..9236609934e 100644 --- a/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb @@ -6,7 +6,7 @@ module QA it 'user squashes commits while merging' do Flow::Login.sign_in - project = Resource::Project.fabricate! do |project| + project = Resource::Project.fabricate_via_api! do |project| project.name = "squash-before-merge" end diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb index 7b1c2a71158..bf5a9501cba 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/add_list_delete_branches_spec.rb @@ -18,7 +18,7 @@ module QA before do Flow::Login.sign_in - project = Resource::Project.fabricate! do |proj| + project = Resource::Project.fabricate_via_api! do |proj| proj.name = 'project-qa-test' proj.description = 'project for qa test' end diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb index ff0f212c289..ee5114a04af 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_http_spec.rb @@ -8,7 +8,7 @@ module QA Flow::Login.sign_in # Create a project to push to - project = Resource::Project.fabricate! do |project| + project = Resource::Project.fabricate_via_api! do |project| project.name = 'git-protocol-project' end diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb index 0e8b8203c34..a9e9380cac4 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/protocol_v2_push_ssh_spec.rb @@ -34,7 +34,7 @@ module QA it 'user pushes to the repository' do # Create a project to push to - project = Resource::Project.fabricate! do |project| + project = Resource::Project.fabricate_via_api! do |project| project.name = 'git-protocol-project' end diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb index 059362704b4..ae95f5a7a44 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_mirroring_over_http_spec.rb @@ -7,7 +7,7 @@ module QA Runtime::Browser.visit(:gitlab, Page::Main::Login) Page::Main::Login.perform(&:sign_in_using_credentials) - target_project = Resource::Project.fabricate! do |project| + target_project = Resource::Project.fabricate_via_api! do |project| project.name = 'push-mirror-target-project' end target_project_uri = target_project.repository_http_location.uri diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb index 2bd54d763a6..9db5fe5292f 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_over_http_spec.rb @@ -6,12 +6,11 @@ module QA it 'user pushes code to the repository' do Flow::Login.sign_in - project_push = Resource::Repository::ProjectPush.fabricate! do |push| + Resource::Repository::ProjectPush.fabricate! do |push| push.file_name = 'README.md' push.file_content = '# This is a test project' push.commit_message = 'Add README.md' - end - project_push.project.visit! + end.project.visit! expect(page).to have_content('README.md') expect(page).to have_content('This is a test project') diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb index 5d0f4b215f4..455db4d811d 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb @@ -6,7 +6,7 @@ module QA let(:branch_name) { 'protected-branch' } let(:commit_message) { 'Protected push commit message' } let(:project) do - Resource::Project.fabricate! do |resource| + Resource::Project.fabricate_via_api! do |resource| resource.name = 'protected-branch-project' resource.initialize_with_readme = true end diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/use_ssh_key_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/use_ssh_key_spec.rb index 1837a110d79..ab60ee33c1e 100644 --- a/qa/qa/specs/features/browser_ui/3_create/repository/use_ssh_key_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/repository/use_ssh_key_spec.rb @@ -15,14 +15,12 @@ module QA resource.title = key_title end - project_push = Resource::Repository::ProjectPush.fabricate! do |push| + Resource::Repository::ProjectPush.fabricate! do |push| push.ssh_key = key push.file_name = 'README.md' push.file_content = '# Test Use SSH Key' push.commit_message = 'Add README.md' - end - - project_push.project.visit! + end.project.visit! expect(page).to have_content('README.md') expect(page).to have_content('Test Use SSH Key') diff --git a/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb b/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb index 42aa527da85..185d10a64ed 100644 --- a/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/wiki/create_edit_clone_push_wiki_spec.rb @@ -6,7 +6,7 @@ module QA it 'user creates, edits, clones, and pushes to the wiki' do Flow::Login.sign_in - wiki = Resource::Wiki.fabricate! do |resource| + wiki = Resource::Wiki.fabricate_via_browser_ui! do |resource| resource.title = 'Home' resource.content = '# My First Wiki Content' resource.message = 'Update home' -- cgit v1.2.3