Read about our upcoming Code of Conduct on this issue

Commit 256e046b authored by James Lopez's avatar James Lopez
Browse files

Merge branch 'enable_example_wording_cop' into 'master'

Enable RSpec/ExampleWording cop

See merge request gitlab-org/gitlab-ce!27187
......@@ -352,7 +352,7 @@ group :development, :test do
gem 'spring', '~> 2.0.0'
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
gem 'rubocop', '~> 0.54.0'
gem 'rubocop-rspec', '~> 1.22.1'
......
......@@ -289,7 +289,7 @@ GEM
gitlab-markup (1.7.0)
gitlab-sidekiq-fetcher (0.4.0)
sidekiq (~> 5)
gitlab-styles (2.5.1)
gitlab-styles (2.5.2)
rubocop (~> 0.54.0)
rubocop-gitlab-security (~> 0.1.0)
rubocop-rspec (~> 1.19)
......@@ -1025,7 +1025,7 @@ DEPENDENCIES
gitlab-default_value_for (~> 3.1.1)
gitlab-markup (~> 1.7.0)
gitlab-sidekiq-fetcher (~> 0.4.0)
gitlab-styles (~> 2.4)
gitlab-styles (~> 2.5)
gitlab_omniauth-ldap (~> 2.1.1)
gon (~> 6.2)
google-api-client (~> 0.23)
......
......@@ -69,7 +69,7 @@
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])
subject.perform
......@@ -83,7 +83,7 @@
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])
subject.perform
......
# frozen_string_literal: true
require 'spec_helper'
describe API::Pipelines do
......@@ -493,7 +495,7 @@ def expect_variables(variables, expected_variables)
context 'pipeline created is not created by the developer user' do
let(:api_user) { create(:user) }
it 'should not return pipeline variables' do
it 'does not return pipeline variables' do
subject
expect(response).to have_gitlab_http_status(403)
......@@ -502,7 +504,7 @@ def expect_variables(variables, expected_variables)
end
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)
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