Add latest changes from gitlab-org/gitlab@master

2 files changed, 54 insertions, 1 deletions

diff --git a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
index 370bf30f3a4..7d4e6b7efbc 100644
--- a/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
+++ b/qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb
@@ -6,7 +6,7 @@ module QA
       it 'user forks a project, submits a merge request and maintainer merges it' do
         Flow::Login.sign_in
 
-        merge_request = Resource::MergeRequestFromFork.fabricate! do |merge_request|
+        merge_request = Resource::MergeRequestFromFork.fabricate_via_browser_ui! do |merge_request|
           merge_request.fork_branch = 'feature-branch'
         end
 
diff --git a/qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb b/qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb
new file mode 100644
index 00000000000..13fe8918f97
--- /dev/null
+++ b/qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb
@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module QA
+  context 'Create' do
+    describe 'Gitaly repository storage', :orchestrated, :repository_storage, :requires_admin, quarantine: { type: :new } do
+      let(:user) { Resource::User.fabricate_or_use(Runtime::Env.gitlab_qa_username_1, Runtime::Env.gitlab_qa_password_1) }
+      let(:parent_project) do
+        Resource::Project.fabricate_via_api! do |project|
+          project.name = 'parent-project'
+          project.initialize_with_readme = true
+        end
+      end
+      let(:fork_project) do
+        Resource::Fork.fabricate_via_api! do |fork|
+          fork.user = user
+          fork.upstream = parent_project
+        end.project
+      end
+
+      before do
+        parent_project.add_member(user)
+      end
+
+      it 'creates a 2nd fork after moving the parent project' do
+        Flow::Login.sign_in(as: user)
+
+        fork_project.visit!
+
+        parent_project.change_repository_storage(QA::Runtime::Env.additional_repository_storage)
+
+        second_fork_project = Resource::Fork.fabricate_via_api! do |fork|
+          fork.name = "second-fork"
+          fork.user = user
+          fork.upstream = parent_project
+        end.project
+
+        Resource::Repository::ProjectPush.fabricate! do |push|
+          push.project = second_fork_project
+          push.file_name = 'new_file'
+          push.file_content = '# This is a new file'
+          push.commit_message = 'Add new file'
+          push.new_branch = false
+        end.project.visit!
+
+        Page::Project::Show.perform do |show|
+          expect(show).to have_file('new_file')
+          expect(show).to have_name(second_fork_project.name)
+          expect(show).to be_forked_from(parent_project.name)
+        end
+      end
+    end
+  end
+end