diff options
| author | Ramya Authappan <rauthappan@gitlab.com> | 2019-06-19 07:22:55 +0000 |
|---|---|---|
| committer | Ramya Authappan <rauthappan@gitlab.com> | 2019-06-19 07:22:55 +0000 |
| commit | c3d772326c7301a4e160d45ae3e251c42aa10169 (patch) | |
| tree | dc6521a88613e9ac524b949daf74b38705b219c4 | |
| parent | a51e9d86291d40869a84d1e9f308e7e0f3319bd5 (diff) | |
| parent | cf8df7ff87821b21050cc7e6f4d15b48234be91f (diff) | |
| download | gitlab-ce-c3d772326c7301a4e160d45ae3e251c42aa10169.tar.gz | |
Merge branch 'qa-ml-unquarantine-merge-fork-test' into 'master'
Unquarantine merge tests
Closes gitlab-org/quality/nightly#93 and gitlab-org/quality/nightly#94
See merge request gitlab-org/gitlab-ce!29833
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/merge_request/merge_merge_request_from_fork_spec.rb | 3 | ||||
| -rw-r--r-- | qa/qa/specs/features/browser_ui/3_create/merge_request/squash_merge_request_spec.rb | 3 |
2 files changed, 2 insertions, 4 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 c7db595284e..6ca7af8a3af 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 @@ -1,8 +1,7 @@ # frozen_string_literal: true module QA - # Failure issue: https://gitlab.com/gitlab-org/quality/nightly/issues/94 - context 'Create', :quarantine do + context 'Create' do describe 'Merge request creation from fork' do it 'user forks a project, submits a merge request and maintainer merges it' do Runtime::Browser.visit(:gitlab, Page::Main::Login) 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 86692623790..a93f2695ec2 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 @@ -1,8 +1,7 @@ # frozen_string_literal: true module QA - # Failure issue: https://gitlab.com/gitlab-org/quality/nightly/issues/93 - context 'Create', :quarantine do + context 'Create' do describe 'Merge request squashing' do it 'user squashes commits while merging' do Runtime::Browser.visit(:gitlab, Page::Main::Login) |