From e0ab7eda1b1013e3246b0db28689b0749158f0bf Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 20 Jan 2020 18:08:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- qa/README.md | 10 ++++++++++ .../browser_ui/1_manage/project/import_github_repo_spec.rb | 3 +-- .../3_create/merge_request/rebase_merge_request_spec.rb | 3 +-- .../3_create/repository/protocol_v2_push_http_spec.rb | 3 +-- .../3_create/repository/protocol_v2_push_ssh_spec.rb | 3 +-- .../auto_devops/create_project_with_auto_devops_spec.rb | 3 +-- 6 files changed, 15 insertions(+), 10 deletions(-) (limited to 'qa') diff --git a/qa/README.md b/qa/README.md index 1bfa83cadf1..cdc84da1c5e 100644 --- a/qa/README.md +++ b/qa/README.md @@ -67,6 +67,16 @@ bundle exec bin/qa Test::Instance::All http://localhost:3000 Note: If you want to run tests requiring SSH against GDK, you will need to [modify your GDK setup](https://gitlab.com/gitlab-org/gitlab-qa/blob/master/docs/run_qa_against_gdk.md). +#### Running EE tests + +When running EE tests you'll need to have a license available. GitLab engineers can [request a license](https://about.gitlab.com/handbook/developer-onboarding/#working-on-gitlab-ee). + +Once you have the license file you can export it as an environment variable and then the framework can use it. If you do so it will be installed automatically. + +``` +export EE_LICENSE=$(cat /path/to/gitlab_license) +``` + ### Writing tests - [Writing tests from scratch tutorial](../doc/development/testing_guide/end_to_end/quick_start_guide.md) diff --git a/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb b/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb index 14eaf770f10..d85929ebbca 100644 --- a/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb +++ b/qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb @@ -1,9 +1,8 @@ # frozen_string_literal: true module QA - # https://gitlab.com/gitlab-org/gitlab/issues/26952 # BUG_IN_CODE - context 'Manage', :github, :quarantine do + context 'Manage', :github, quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/26952' do describe 'Project import from GitHub' do let(:imported_project) do Resource::ProjectImportedFromGithub.fabricate! do |project| 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 e4c79bf75b5..ff995fc1e0c 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 @@ -1,9 +1,8 @@ # frozen_string_literal: true module QA - # Failure issue: https://gitlab.com/gitlab-org/gitlab/issues/36817 # BUG_IN_CODE - context 'Create', :quarantine do + context 'Create', quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/36817' do describe 'Merge request rebasing' do it 'user rebases source branch of merge request' do Flow::Login.sign_in 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 1f156dfe6d5..f3edd822ef7 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 @@ -2,9 +2,8 @@ module QA # Git protocol v2 is temporarily disabled - # https://gitlab.com/gitlab-org/gitlab/issues/27828 # BUG_IN_CODE - context 'Create', :quarantine do + context 'Create', quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/27828' do describe 'Push over HTTP using Git protocol version 2', :requires_git_protocol_v2 do it 'user pushes to the repository' do Flow::Login.sign_in 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 55c70656462..3362404e11b 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 @@ -2,9 +2,8 @@ module QA # Git protocol v2 is temporarily disabled - # https://gitlab.com/gitlab-org/gitlab/issues/27828 # BUG_IN_CODE - context 'Create', :quarantine do + context 'Create', quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/27828' do describe 'Push over SSH using Git protocol version 2', :requires_git_protocol_v2 do # Note: If you run this test against GDK make sure you've enabled sshd and # enabled setting the Git protocol by adding `AcceptEnv GIT_PROTOCOL` to diff --git a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb index 54014ff7067..7acc9eb37bd 100644 --- a/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb +++ b/qa/qa/specs/features/browser_ui/7_configure/auto_devops/create_project_with_auto_devops_spec.rb @@ -50,8 +50,7 @@ module QA end end - # Failure issue: https://gitlab.com/gitlab-org/gitlab/issues/118481 - describe 'Auto DevOps support', :orchestrated, :kubernetes, :quarantine do + describe 'Auto DevOps support', :orchestrated, :kubernetes, quarantine: 'https://gitlab.com/gitlab-org/gitlab/issues/118481' do context 'when rbac is enabled' do before(:all) do @cluster = Service::KubernetesCluster.new.create! -- cgit v1.2.1