Commit fd7d66f8 authored by James Lopez's avatar James Lopez

Merge branch 'enable_example_wording_cop' into 'master'

[EE] Enable RSpec/ExampleWording cop

See merge request gitlab-org/gitlab-ee!10692
parents 3bfb7df6 58ef7f08
...@@ -367,7 +367,7 @@ group :development, :test do ...@@ -367,7 +367,7 @@ group :development, :test do
gem 'spring', '~> 2.0.0' gem 'spring', '~> 2.0.0'
gem 'spring-commands-rspec', '~> 1.0.4' gem 'spring-commands-rspec', '~> 1.0.4'
gem 'gitlab-styles', '~> 2.4', require: false gem 'gitlab-styles', '~> 2.5', require: false
# Pin these dependencies, otherwise a new rule could break the CI pipelines # Pin these dependencies, otherwise a new rule could break the CI pipelines
gem 'rubocop', '~> 0.54.0' gem 'rubocop', '~> 0.54.0'
gem 'rubocop-rspec', '~> 1.22.1' gem 'rubocop-rspec', '~> 1.22.1'
......
...@@ -315,7 +315,7 @@ GEM ...@@ -315,7 +315,7 @@ GEM
gitlab-markup (1.7.0) gitlab-markup (1.7.0)
gitlab-sidekiq-fetcher (0.4.0) gitlab-sidekiq-fetcher (0.4.0)
sidekiq (~> 5) sidekiq (~> 5)
gitlab-styles (2.5.1) gitlab-styles (2.5.2)
rubocop (~> 0.54.0) rubocop (~> 0.54.0)
rubocop-gitlab-security (~> 0.1.0) rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.19) rubocop-rspec (~> 1.19)
...@@ -1064,7 +1064,7 @@ DEPENDENCIES ...@@ -1064,7 +1064,7 @@ DEPENDENCIES
gitlab-license (~> 1.0) gitlab-license (~> 1.0)
gitlab-markup (~> 1.7.0) gitlab-markup (~> 1.7.0)
gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-sidekiq-fetcher (~> 0.4.0)
gitlab-styles (~> 2.4) gitlab-styles (~> 2.5)
gitlab_omniauth-ldap (~> 2.1.1) gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2) gon (~> 6.2)
google-api-client (~> 0.23) google-api-client (~> 0.23)
......
# frozen_string_literal: true
require 'spec_helper' require 'spec_helper'
describe 'issue boards', :js do describe 'issue boards', :js do
...@@ -149,11 +151,11 @@ describe 'issue boards', :js do ...@@ -149,11 +151,11 @@ describe 'issue boards', :js do
wait_for_requests wait_for_requests
end end
it 'should not have remove button' do it 'does not have remove button' do
expect(page).to have_selector('.js-visual-token .remove-token', count: 0) expect(page).to have_selector('.js-visual-token .remove-token', count: 0)
end end
it 'should not be able to be backspaced' do it 'is not able to be backspaced' do
find('.input-token .filtered-search').native.send_key(:backspace) find('.input-token .filtered-search').native.send_key(:backspace)
expect(page).to have_selector('.js-visual-token', count: 1) expect(page).to have_selector('.js-visual-token', count: 1)
end end
......
# frozen_string_literal: true
require 'spec_helper' require 'spec_helper'
describe 'Operations dropdown navbar EE' do describe 'Operations dropdown navbar EE' do
...@@ -14,11 +16,11 @@ describe 'Operations dropdown navbar EE' do ...@@ -14,11 +16,11 @@ describe 'Operations dropdown navbar EE' do
visit project_issues_path(project) visit project_issues_path(project)
end end
it 'should have a `Operations` link' do it 'has an `Operations` link' do
expect(page).to have_link('Operations', href: operations_path) expect(page).to have_link('Operations', href: operations_path)
end end
it 'should have a `Environments` link' do it 'has an `Environments` link' do
expect(page).to have_link('Environments', href: operations_environments_path) expect(page).to have_link('Environments', href: operations_environments_path)
end end
end end
...@@ -80,7 +80,7 @@ shared_examples_for 'existing issuable with scoped labels' do ...@@ -80,7 +80,7 @@ shared_examples_for 'existing issuable with scoped labels' do
expect(issuable.reload.labels).to match_array([label3]) expect(issuable.reload.labels).to match_array([label3])
end end
it 'it preserves multiple exclusive scoped labels when only removing labels' do it 'preserves multiple exclusive scoped labels when only removing labels' do
create(:label_link, label: label1, target: issuable) create(:label_link, label: label1, target: issuable)
create(:label_link, label: label2, target: issuable) create(:label_link, label: label2, target: issuable)
create(:label_link, label: label3, target: issuable) create(:label_link, label: label3, target: issuable)
......
...@@ -83,7 +83,7 @@ describe ClearSharedRunnersMinutesWorker do ...@@ -83,7 +83,7 @@ describe ClearSharedRunnersMinutesWorker do
context 'when some extra minutes are used' do context 'when some extra minutes are used' do
let(:minutes_used) { 105 } let(:minutes_used) { 105 }
it 'it discounts the extra minutes used' do it 'discounts the extra minutes used' do
subject subject
expect(namespace.reload.extra_shared_runners_minutes_limit).to eq(5) expect(namespace.reload.extra_shared_runners_minutes_limit).to eq(5)
......
...@@ -69,7 +69,7 @@ describe QA::Specs::Runner do ...@@ -69,7 +69,7 @@ describe QA::Specs::Runner do
subject { described_class.new } subject { described_class.new }
it 'it includes default args and excludes the skip_signup_disabled tag' do it 'includes default args and excludes the skip_signup_disabled tag' do
expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~skip_signup_disabled', *described_class::DEFAULT_TEST_PATH_ARGS]) expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~skip_signup_disabled', *described_class::DEFAULT_TEST_PATH_ARGS])
subject.perform subject.perform
...@@ -83,7 +83,7 @@ describe QA::Specs::Runner do ...@@ -83,7 +83,7 @@ describe QA::Specs::Runner do
subject { described_class.new } subject { described_class.new }
it 'it includes default args and excludes the requires_git_protocol_v2 tag' do it 'includes default args and excludes the requires_git_protocol_v2 tag' do
expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~requires_git_protocol_v2', *described_class::DEFAULT_TEST_PATH_ARGS]) expect_rspec_runner_arguments(['--tag', '~orchestrated', '--tag', '~requires_git_protocol_v2', *described_class::DEFAULT_TEST_PATH_ARGS])
subject.perform subject.perform
......
# frozen_string_literal: true
require 'spec_helper' require 'spec_helper'
describe API::Pipelines do describe API::Pipelines do
...@@ -493,7 +495,7 @@ describe API::Pipelines do ...@@ -493,7 +495,7 @@ describe API::Pipelines do
context 'pipeline created is not created by the developer user' do context 'pipeline created is not created by the developer user' do
let(:api_user) { create(:user) } let(:api_user) { create(:user) }
it 'should not return pipeline variables' do it 'does not return pipeline variables' do
subject subject
expect(response).to have_gitlab_http_status(403) expect(response).to have_gitlab_http_status(403)
...@@ -502,7 +504,7 @@ describe API::Pipelines do ...@@ -502,7 +504,7 @@ describe API::Pipelines do
end end
context 'user is not a project member' do context 'user is not a project member' do
it 'should not return pipeline variables' do it 'does not return pipeline variables' do
get api("/projects/#{project.id}/pipelines/#{pipeline.id}/variables", non_member) get api("/projects/#{project.id}/pipelines/#{pipeline.id}/variables", non_member)
expect(response).to have_gitlab_http_status(404) expect(response).to have_gitlab_http_status(404)
......
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