diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-06 21:09:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-06 21:09:41 +0300 |
commit | 37419c44f04cd802ac89fe2d54b8501a0718a5e3 (patch) | |
tree | 7ff8770bf860a7aed343aa08fae8caa11c65e10d /qa | |
parent | 5f4dec4ac396f844fa55ecd9a8563a0348872ef6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa')
9 files changed, 10 insertions, 0 deletions
diff --git a/qa/qa/specs/features/browser_ui/3_create/gitaly/high_availability_spec.rb b/qa/qa/specs/features/browser_ui/3_create/gitaly/high_availability_spec.rb index 16757a602dc..40dd013882d 100644 --- a/qa/qa/specs/features/browser_ui/3_create/gitaly/high_availability_spec.rb +++ b/qa/qa/specs/features/browser_ui/3_create/gitaly/high_availability_spec.rb @@ -9,6 +9,7 @@ module QA project.name = 'gitaly_high_availability' end end + let(:initial_file) { 'pushed_to_primary.txt' } let(:final_file) { 'committed_to_primary.txt' } let(:praefect_manager) { Service::PraefectManager.new } 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 index f586c25165c..59e4bb038a7 100644 --- 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 @@ -10,6 +10,7 @@ module QA project.initialize_with_readme = true end end + let(:fork_project) do Resource::Fork.fabricate_via_api! do |fork| fork.user = user diff --git a/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb b/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb index 19003614f1a..0f04b3b6186 100644 --- a/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb +++ b/qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb @@ -15,6 +15,7 @@ module QA Resource::PersonalAccessToken.fabricate!.access_token end + let(:project) do Resource::Project.fabricate_via_api! do |project| project.name = 'maven-package-project' diff --git a/qa/qa/specs/features/browser_ui/5_package/npm_registry_spec.rb b/qa/qa/specs/features/browser_ui/5_package/npm_registry_spec.rb index 1118ab02fe8..471d66c2f21 100644 --- a/qa/qa/specs/features/browser_ui/5_package/npm_registry_spec.rb +++ b/qa/qa/specs/features/browser_ui/5_package/npm_registry_spec.rb @@ -14,6 +14,7 @@ module QA Resource::PersonalAccessToken.fabricate!.access_token end + let(:project) do Resource::Project.fabricate_via_api! do |project| project.name = 'npm-registry-project' diff --git a/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb b/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb index 673125c90f2..ba36e4fa290 100644 --- a/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb @@ -8,6 +8,7 @@ module QA project.name = 'pipelines-dependent-relationship' end end + let!(:runner) do Resource::Runner.fabricate_via_api! do |runner| runner.project = project diff --git a/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb b/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb index 05b9859f112..69f66ee4edf 100644 --- a/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb +++ b/qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb @@ -8,6 +8,7 @@ module QA project.name = 'pipeline-independent-relationship' end end + let!(:runner) do Resource::Runner.fabricate_via_api! do |runner| runner.project = project diff --git a/qa/spec/resource/base_spec.rb b/qa/spec/resource/base_spec.rb index fe84b3d024a..b23de19e1f8 100644 --- a/qa/spec/resource/base_spec.rb +++ b/qa/spec/resource/base_spec.rb @@ -226,6 +226,7 @@ describe QA::Resource::Base do end end end + let(:first_resource) do Class.new(base) do attribute :test do @@ -233,6 +234,7 @@ describe QA::Resource::Base do end end end + let(:second_resource) do Class.new(base) do attribute :test do diff --git a/qa/spec/resource/events/project_spec.rb b/qa/spec/resource/events/project_spec.rb index dd544ec7ac8..98da87906fa 100644 --- a/qa/spec/resource/events/project_spec.rb +++ b/qa/spec/resource/events/project_spec.rb @@ -8,6 +8,7 @@ describe QA::Resource::Events::Project do end end end + let(:all_events) do [ { diff --git a/qa/spec/scenario/test/integration/mattermost_spec.rb b/qa/spec/scenario/test/integration/mattermost_spec.rb index 4452e890ebe..7e4eb6284e8 100644 --- a/qa/spec/scenario/test/integration/mattermost_spec.rb +++ b/qa/spec/scenario/test/integration/mattermost_spec.rb @@ -10,6 +10,7 @@ describe QA::Scenario::Test::Integration::Mattermost do mattermost_address: 'http://mattermost_address' } end + let(:named_options) { %w[--address http://gitlab_address --mattermost-address http://mattermost_address] } let(:tags) { [:mattermost] } let(:options) { ['path1']} |