From 8f9962c32123e86a3036bc5f0634b2d7e27b26ff Mon Sep 17 00:00:00 2001
From: Doug Stull <dstull@gitlab.com>
Date: Tue, 4 Aug 2020 13:21:28 -0400
Subject: [PATCH] Resolve RSpec/EmptyLineAfterLetBlock Exceptions in QA
- comply to style guide
---
.rubocop_todo.yml | 16 ----------------
.../3_create/gitaly/high_availability_spec.rb | 1 +
.../repository/move_project_create_fork_spec.rb | 1 +
.../5_package/maven_repository_spec.rb | 1 +
.../browser_ui/5_package/npm_registry_spec.rb | 1 +
...hild_pipelines_dependent_relationship_spec.rb | 1 +
...ld_pipelines_independent_relationship_spec.rb | 1 +
.../1_manage/group/group_ldap_sync_spec.rb | 2 ++
.../add_batch_comments_in_merge_request_spec.rb | 1 +
.../repository/assign_code_owners_spec.rb | 1 +
.../pull_mirroring_over_ssh_with_key_spec.rb | 1 +
.../restrict_push_protected_branch_spec.rb | 1 +
.../6_release/multi-project_pipelines_spec.rb | 2 ++
qa/spec/resource/base_spec.rb | 2 ++
qa/spec/resource/events/project_spec.rb | 1 +
.../scenario/test/integration/mattermost_spec.rb | 1 +
16 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 2c2d3bfe90bea..cdb37ef5dec34 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -290,22 +290,6 @@ RSpec/ContextWording:
RSpec/EmptyLineAfterLetBlock:
Enabled: true
Exclude:
- - 'qa/qa/specs/features/api/3_create/repository/changing_repository_storage_spec.rb'
- - 'qa/qa/specs/features/browser_ui/3_create/gitaly/high_availability_spec.rb'
- - 'qa/qa/specs/features/browser_ui/3_create/repository/move_project_create_fork_spec.rb'
- - 'qa/qa/specs/features/browser_ui/5_package/maven_repository_spec.rb'
- - 'qa/qa/specs/features/browser_ui/5_package/npm_registry_spec.rb'
- - 'qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_dependent_relationship_spec.rb'
- - 'qa/qa/specs/features/browser_ui/6_release/pipeline/parent_child_pipelines_independent_relationship_spec.rb'
- - 'qa/qa/specs/features/ee/browser_ui/1_manage/group/group_ldap_sync_spec.rb'
- - 'qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb'
- - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb'
- - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb'
- - 'qa/qa/specs/features/ee/browser_ui/3_create/repository/restrict_push_protected_branch_spec.rb'
- - 'qa/qa/specs/features/ee/browser_ui/6_release/multi-project_pipelines_spec.rb'
- - 'qa/spec/resource/base_spec.rb'
- - 'qa/spec/resource/events/project_spec.rb'
- - 'qa/spec/scenario/test/integration/mattermost_spec.rb'
- 'spec/config/object_store_settings_spec.rb'
- 'spec/controllers/boards/issues_controller_spec.rb'
- 'spec/controllers/groups/milestones_controller_spec.rb'
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 16757a602dcd0..40dd013882d66 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 f586c25165cf8..59e4bb038a766 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 19003614f1aba..0f04b3b61862f 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 1118ab02fe86a..471d66c2f21f1 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 673125c90f234..ba36e4fa290bc 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 05b9859f1122c..69f66ee4edf4c 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/qa/specs/features/ee/browser_ui/1_manage/group/group_ldap_sync_spec.rb b/qa/qa/specs/features/ee/browser_ui/1_manage/group/group_ldap_sync_spec.rb
index 49a0e923b1e50..fec81a75bbe00 100644
--- a/qa/qa/specs/features/ee/browser_ui/1_manage/group/group_ldap_sync_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/1_manage/group/group_ldap_sync_spec.rb
@@ -58,6 +58,7 @@ module QA
}
]
end
+
let(:owner_user) { 'enguser1' }
let(:sync_users) { ['ENG User 2', 'ENG User 3'] }
@@ -108,6 +109,7 @@ module QA
}
]
end
+
let(:owner_user) { 'hruser1' }
let(:sync_users) { ['HR User 2', 'HR User 3'] }
diff --git a/qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb b/qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb
index 26f44d8b67e1f..d9abf82bf5a2d 100644
--- a/qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb
@@ -8,6 +8,7 @@ module QA
project.name = 'project-with-merge-request'
end
end
+
let(:merge_request) do
Resource::MergeRequest.fabricate_via_api! do |merge_request|
merge_request.title = 'This is a merge request'
diff --git a/qa/qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb b/qa/qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb
index 2a7cfbd0365ce..f42ea3854a4dc 100644
--- a/qa/qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/3_create/repository/assign_code_owners_spec.rb
@@ -13,6 +13,7 @@ module QA
project.initialize_with_readme = true
end
end
+
let(:branch_name) { 'protected-branch' }
before do
diff --git a/qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb b/qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb
index cc4067eac31c7..6759914fbd2ab 100644
--- a/qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/3_create/repository/pull_mirroring_over_ssh_with_key_spec.rb
@@ -11,6 +11,7 @@ module QA
project_push.commit_message = 'Add README.md'
end
end
+
let(:source_project_uri) { source.project.repository_ssh_location.uri }
let(:target_project) do
Resource::Project.fabricate_via_api! do |project|
diff --git a/qa/qa/specs/features/ee/browser_ui/3_create/repository/restrict_push_protected_branch_spec.rb b/qa/qa/specs/features/ee/browser_ui/3_create/repository/restrict_push_protected_branch_spec.rb
index f5924c45bc54b..0d3d9fff5a15b 100644
--- a/qa/qa/specs/features/ee/browser_ui/3_create/repository/restrict_push_protected_branch_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/3_create/repository/restrict_push_protected_branch_spec.rb
@@ -68,6 +68,7 @@ module QA
group.path = "access-to-protected-branch-#{SecureRandom.hex(8)}"
end
end
+
let(:project) do
Resource::Project.fabricate_via_api! do |resource|
resource.name = 'group-with-access-to-protected-branch'
diff --git a/qa/qa/specs/features/ee/browser_ui/6_release/multi-project_pipelines_spec.rb b/qa/qa/specs/features/ee/browser_ui/6_release/multi-project_pipelines_spec.rb
index 6bfc9531c2798..5950896f846e2 100644
--- a/qa/qa/specs/features/ee/browser_ui/6_release/multi-project_pipelines_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/6_release/multi-project_pipelines_spec.rb
@@ -12,11 +12,13 @@ module QA
project.name = upstream_project_name
end
end
+
let(:downstream_project) do
Resource::Project.fabricate_via_api! do |project|
project.name = downstream_project_name
end
end
+
let!(:runner) do
Resource::Runner.fabricate_via_api! do |runner|
runner.project = upstream_project
diff --git a/qa/spec/resource/base_spec.rb b/qa/spec/resource/base_spec.rb
index fe84b3d024ae2..b23de19e1f874 100644
--- a/qa/spec/resource/base_spec.rb
+++ b/qa/spec/resource/base_spec.rb
@@ -226,6 +226,7 @@ def self.current_url
end
end
end
+
let(:first_resource) do
Class.new(base) do
attribute :test do
@@ -233,6 +234,7 @@ def self.current_url
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 dd544ec7ac8a1..98da87906fa2b 100644
--- a/qa/spec/resource/events/project_spec.rb
+++ b/qa/spec/resource/events/project_spec.rb
@@ -8,6 +8,7 @@ def api_get_path
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 4452e890ebe74..7e4eb6284e861 100644
--- a/qa/spec/scenario/test/integration/mattermost_spec.rb
+++ b/qa/spec/scenario/test/integration/mattermost_spec.rb
@@ -10,6 +10,7 @@
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']}
--
GitLab