Commit eef5e109 authored by Dylan Griffith's avatar Dylan Griffith

Merge branch 'issue#325836-fix-empty-line-after-let-it-be-merge-projects-module' into 'master'

Fix EmptyLineAfterFinalLetItBe Rubocop offenses for projects module

See merge request gitlab-org/gitlab!58187
parents 4497a501 dee3fbcf
...@@ -603,26 +603,6 @@ RSpec/EmptyLineAfterFinalLetItBe: ...@@ -603,26 +603,6 @@ RSpec/EmptyLineAfterFinalLetItBe:
- spec/features/merge_request/user_posts_notes_spec.rb - spec/features/merge_request/user_posts_notes_spec.rb
- spec/features/operations_sidebar_link_spec.rb - spec/features/operations_sidebar_link_spec.rb
- spec/features/participants_autocomplete_spec.rb - spec/features/participants_autocomplete_spec.rb
- spec/features/projects/badges/pipeline_badge_spec.rb
- spec/features/projects/branches/user_deletes_branch_spec.rb
- spec/features/projects/commit/cherry_pick_spec.rb
- spec/features/projects/commit/user_comments_on_commit_spec.rb
- spec/features/projects/commit/user_reverts_commit_spec.rb
- spec/features/projects/commit/user_views_user_status_on_commit_spec.rb
- spec/features/projects/confluence/user_views_confluence_page_spec.rb
- spec/features/projects/files/gitlab_ci_syntax_yml_dropdown_spec.rb
- spec/features/projects/issues/design_management/user_views_design_images_spec.rb
- spec/features/projects/labels/user_sees_links_to_issuables_spec.rb
- spec/features/projects/labels/user_views_labels_spec.rb
- spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
- spec/features/projects/merge_request_button_spec.rb
- spec/features/projects/pages/user_adds_domain_spec.rb
- spec/features/projects/pipelines/pipeline_spec.rb
- spec/features/projects/product_analytics/events_spec.rb
- spec/features/projects/settings/project_settings_spec.rb
- spec/features/projects/settings/repository_settings_spec.rb
- spec/features/projects/snippets/user_views_snippets_spec.rb
- spec/features/projects/user_sees_user_popover_spec.rb
- spec/features/snippets/embedded_snippet_spec.rb - spec/features/snippets/embedded_snippet_spec.rb
- spec/finders/alert_management/alerts_finder_spec.rb - spec/finders/alert_management/alerts_finder_spec.rb
- spec/finders/ci/commit_statuses_finder_spec.rb - spec/finders/ci/commit_statuses_finder_spec.rb
......
---
title: Fix EmptyLineAfterFinalLetItBe Rubocop offenses for projects module
merge_request: 58187
author: Huzaifa Iftikhar @huzaifaiftikhar
type: fixed
...@@ -4,6 +4,7 @@ require 'spec_helper' ...@@ -4,6 +4,7 @@ require 'spec_helper'
RSpec.describe 'Pipeline Badge' do RSpec.describe 'Pipeline Badge' do
let_it_be(:project) { create(:project, :repository, :public) } let_it_be(:project) { create(:project, :repository, :public) }
let(:ref) { project.default_branch } let(:ref) { project.default_branch }
context 'when the project has a pipeline' do context 'when the project has a pipeline' do
......
...@@ -4,6 +4,7 @@ require "spec_helper" ...@@ -4,6 +4,7 @@ require "spec_helper"
RSpec.describe "User deletes branch", :js do RSpec.describe "User deletes branch", :js do
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let(:project) { create(:project, :repository) } let(:project) { create(:project, :repository) }
before do before do
......
...@@ -5,6 +5,7 @@ require 'spec_helper' ...@@ -5,6 +5,7 @@ require 'spec_helper'
RSpec.describe 'Cherry-pick Commits', :js do RSpec.describe 'Cherry-pick Commits', :js do
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let_it_be(:sha) { '7d3b0f7cff5f37573aea97cebfd5692ea1689924' } let_it_be(:sha) { '7d3b0f7cff5f37573aea97cebfd5692ea1689924' }
let!(:project) { create_default(:project, :repository, namespace: user.namespace) } let!(:project) { create_default(:project, :repository, namespace: user.namespace) }
let(:master_pickable_commit) { project.commit(sha) } let(:master_pickable_commit) { project.commit(sha) }
......
...@@ -8,6 +8,7 @@ RSpec.describe "User comments on commit", :js do ...@@ -8,6 +8,7 @@ RSpec.describe "User comments on commit", :js do
let_it_be(:project) { create(:project, :repository) } let_it_be(:project) { create(:project, :repository) }
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let(:comment_text) { "XML attached" } let(:comment_text) { "XML attached" }
before_all do before_all do
......
...@@ -6,6 +6,7 @@ RSpec.describe 'User reverts a commit', :js do ...@@ -6,6 +6,7 @@ RSpec.describe 'User reverts a commit', :js do
include RepoHelpers include RepoHelpers
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let!(:project) { create_default(:project, :repository, namespace: user.namespace) } let!(:project) { create_default(:project, :repository, namespace: user.namespace) }
before do before do
......
...@@ -7,6 +7,7 @@ RSpec.describe 'Project > Commit > View user status' do ...@@ -7,6 +7,7 @@ RSpec.describe 'Project > Commit > View user status' do
let_it_be(:project) { create(:project, :repository) } let_it_be(:project) { create(:project, :repository) }
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let(:commit_author) { create(:user, email: sample_commit.author_email) } let(:commit_author) { create(:user, email: sample_commit.author_email) }
before do before do
......
...@@ -4,6 +4,7 @@ require 'spec_helper' ...@@ -4,6 +4,7 @@ require 'spec_helper'
RSpec.describe 'User views the Confluence page' do RSpec.describe 'User views the Confluence page' do
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let(:project) { create(:project, :public) } let(:project) { create(:project, :public) }
before do before do
......
...@@ -6,6 +6,7 @@ RSpec.describe 'Projects > Files > User wants to add a .gitlab-ci.yml file' do ...@@ -6,6 +6,7 @@ RSpec.describe 'Projects > Files > User wants to add a .gitlab-ci.yml file' do
include Spec::Support::Helpers::Features::EditorLiteSpecHelpers include Spec::Support::Helpers::Features::EditorLiteSpecHelpers
let_it_be(:namespace) { create(:namespace) } let_it_be(:namespace) { create(:namespace) }
let(:project) { create(:project, :repository, namespace: namespace) } let(:project) { create(:project, :repository, namespace: namespace) }
before do before do
......
...@@ -8,6 +8,7 @@ RSpec.describe 'Users views raw design image files' do ...@@ -8,6 +8,7 @@ RSpec.describe 'Users views raw design image files' do
let_it_be(:project) { create(:project, :public) } let_it_be(:project) { create(:project, :public) }
let_it_be(:issue) { create(:issue, project: project) } let_it_be(:issue) { create(:issue, project: project) }
let_it_be(:design) { create(:design, :with_file, issue: issue, versions_count: 2) } let_it_be(:design) { create(:design, :with_file, issue: issue, versions_count: 2) }
let(:newest_version) { design.versions.ordered.first } let(:newest_version) { design.versions.ordered.first }
let(:oldest_version) { design.versions.ordered.last } let(:oldest_version) { design.versions.ordered.last }
......
...@@ -51,6 +51,7 @@ RSpec.describe 'Projects > Labels > User sees links to issuables' do ...@@ -51,6 +51,7 @@ RSpec.describe 'Projects > Labels > User sees links to issuables' do
context 'with a group label' do context 'with a group label' do
let_it_be(:group) { create(:group) } let_it_be(:group) { create(:group) }
let(:label) { create(:group_label, group: group, title: 'bug') } let(:label) { create(:group_label, group: group, title: 'bug') }
context 'when merge requests and issues are enabled for the project' do context 'when merge requests and issues are enabled for the project' do
......
...@@ -5,6 +5,7 @@ require "spec_helper" ...@@ -5,6 +5,7 @@ require "spec_helper"
RSpec.describe "User views labels" do RSpec.describe "User views labels" do
let_it_be(:project) { create(:project_empty_repo, :public) } let_it_be(:project) { create(:project_empty_repo, :public) }
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let(:label_titles) { %w[bug enhancement feature] } let(:label_titles) { %w[bug enhancement feature] }
let!(:prioritized_label) { create(:label, project: project, title: 'prioritized-label-name', priority: 1) } let!(:prioritized_label) { create(:label, project: project, title: 'prioritized-label-name', priority: 1) }
......
...@@ -9,6 +9,7 @@ RSpec.describe 'Projects > Members > Maintainer adds member with expiration date ...@@ -9,6 +9,7 @@ RSpec.describe 'Projects > Members > Maintainer adds member with expiration date
let_it_be(:maintainer) { create(:user) } let_it_be(:maintainer) { create(:user) }
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let(:new_member) { create(:user) } let(:new_member) { create(:user) }
before do before do
......
...@@ -7,6 +7,7 @@ RSpec.describe 'Merge Request button' do ...@@ -7,6 +7,7 @@ RSpec.describe 'Merge Request button' do
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let_it_be(:project) { create(:project, :public, :repository) } let_it_be(:project) { create(:project, :public, :repository) }
let(:forked_project) { fork_project(project, user, repository: true) } let(:forked_project) { fork_project(project, user, repository: true) }
shared_examples 'Merge request button only shown when allowed' do shared_examples 'Merge request button only shown when allowed' do
......
...@@ -5,6 +5,7 @@ RSpec.describe 'User adds pages domain', :js do ...@@ -5,6 +5,7 @@ RSpec.describe 'User adds pages domain', :js do
include LetsEncryptHelpers include LetsEncryptHelpers
let_it_be(:project) { create(:project, pages_https_only: false) } let_it_be(:project) { create(:project, pages_https_only: false) }
let(:user) { create(:user) } let(:user) { create(:user) }
before do before do
......
...@@ -739,6 +739,7 @@ RSpec.describe 'Pipeline', :js do ...@@ -739,6 +739,7 @@ RSpec.describe 'Pipeline', :js do
context 'when build requires resource', :sidekiq_inline do context 'when build requires resource', :sidekiq_inline do
let_it_be(:project) { create(:project, :repository) } let_it_be(:project) { create(:project, :repository) }
let(:pipeline) { create(:ci_pipeline, project: project) } let(:pipeline) { create(:ci_pipeline, project: project) }
let(:resource_group) { create(:ci_resource_group, project: project) } let(:resource_group) { create(:ci_resource_group, project: project) }
......
...@@ -5,6 +5,7 @@ require 'spec_helper' ...@@ -5,6 +5,7 @@ require 'spec_helper'
RSpec.describe 'Product Analytics > Events' do RSpec.describe 'Product Analytics > Events' do
let_it_be(:project) { create(:project_empty_repo) } let_it_be(:project) { create(:project_empty_repo) }
let_it_be(:user) { create(:user) } let_it_be(:user) { create(:user) }
let(:event) { create(:product_analytics_event, project: project) } let(:event) { create(:product_analytics_event, project: project) }
before do before do
......
...@@ -4,6 +4,7 @@ require 'spec_helper' ...@@ -4,6 +4,7 @@ require 'spec_helper'
RSpec.describe 'Projects settings' do RSpec.describe 'Projects settings' do
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let(:user) { project.owner } let(:user) { project.owner }
let(:panel) { find('.general-settings', match: :first) } let(:panel) { find('.general-settings', match: :first) }
let(:button) { panel.find('.btn.gl-button.js-settings-toggle') } let(:button) { panel.find('.btn.gl-button.js-settings-toggle') }
......
...@@ -42,6 +42,7 @@ RSpec.describe 'Projects > Settings > Repository settings' do ...@@ -42,6 +42,7 @@ RSpec.describe 'Projects > Settings > Repository settings' do
context 'Deploy Keys', :js do context 'Deploy Keys', :js do
let_it_be(:private_deploy_key) { create(:deploy_key, title: 'private_deploy_key', public: false) } let_it_be(:private_deploy_key) { create(:deploy_key, title: 'private_deploy_key', public: false) }
let_it_be(:public_deploy_key) { create(:another_deploy_key, title: 'public_deploy_key', public: true) } let_it_be(:public_deploy_key) { create(:another_deploy_key, title: 'public_deploy_key', public: true) }
let(:new_ssh_key) { attributes_for(:key)[:key] } let(:new_ssh_key) { attributes_for(:key)[:key] }
it 'get list of keys' do it 'get list of keys' do
......
...@@ -4,6 +4,7 @@ require 'spec_helper' ...@@ -4,6 +4,7 @@ require 'spec_helper'
RSpec.describe 'Projects > Snippets > User views snippets' do RSpec.describe 'Projects > Snippets > User views snippets' do
let_it_be(:project) { create(:project) } let_it_be(:project) { create(:project) }
let(:user) { create(:user) } let(:user) { create(:user) }
def visit_project_snippets def visit_project_snippets
......
...@@ -6,6 +6,7 @@ RSpec.describe 'User sees user popover', :js do ...@@ -6,6 +6,7 @@ RSpec.describe 'User sees user popover', :js do
include Spec::Support::Helpers::Features::NotesHelpers include Spec::Support::Helpers::Features::NotesHelpers
let_it_be(:project) { create(:project, :repository) } let_it_be(:project) { create(:project, :repository) }
let(:user) { project.creator } let(:user) { project.creator }
let(:merge_request) do let(:merge_request) do
create(:merge_request, source_project: project, target_project: project) create(:merge_request, source_project: project, target_project: project)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment