Commit 6d62547b authored by Robert Speicher's avatar Robert Speicher

Merge branch 'rs-rubocop-rspec-ee' into 'master'

Update rubocop-rspec 1.12.0 -> 1.15.0

See merge request !1609
parents 5b6fa73a 7774aad1
...@@ -956,6 +956,10 @@ RSpec/DescribeClass: ...@@ -956,6 +956,10 @@ RSpec/DescribeClass:
RSpec/DescribeMethod: RSpec/DescribeMethod:
Enabled: false Enabled: false
# Avoid describing symbols.
RSpec/DescribeSymbol:
Enabled: true
# Checks that the second argument to top level describe is the tested method # Checks that the second argument to top level describe is the tested method
# name. # name.
RSpec/DescribedClass: RSpec/DescribedClass:
......
This diff is collapsed.
...@@ -312,7 +312,7 @@ group :development, :test do ...@@ -312,7 +312,7 @@ group :development, :test do
gem 'spring-commands-spinach', '~> 1.1.0' gem 'spring-commands-spinach', '~> 1.1.0'
gem 'rubocop', '~> 0.47.1', require: false gem 'rubocop', '~> 0.47.1', require: false
gem 'rubocop-rspec', '~> 1.12.0', require: false gem 'rubocop-rspec', '~> 1.15.0', require: false
gem 'scss_lint', '~> 0.47.0', require: false gem 'scss_lint', '~> 0.47.0', require: false
gem 'haml_lint', '~> 0.21.0', require: false gem 'haml_lint', '~> 0.21.0', require: false
gem 'simplecov', '~> 0.14.0', require: false gem 'simplecov', '~> 0.14.0', require: false
......
...@@ -704,7 +704,7 @@ GEM ...@@ -704,7 +704,7 @@ GEM
rainbow (>= 1.99.1, < 3.0) rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.7) ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.0, >= 1.0.1) unicode-display_width (~> 1.0, >= 1.0.1)
rubocop-rspec (1.12.0) rubocop-rspec (1.15.0)
rubocop (>= 0.42.0) rubocop (>= 0.42.0)
ruby-fogbugz (0.2.1) ruby-fogbugz (0.2.1)
crack (~> 0.4) crack (~> 0.4)
...@@ -1029,7 +1029,7 @@ DEPENDENCIES ...@@ -1029,7 +1029,7 @@ DEPENDENCIES
rspec-retry (~> 0.4.5) rspec-retry (~> 0.4.5)
rspec_profiling (~> 0.0.5) rspec_profiling (~> 0.0.5)
rubocop (~> 0.47.1) rubocop (~> 0.47.1)
rubocop-rspec (~> 1.12.0) rubocop-rspec (~> 1.15.0)
ruby-fogbugz (~> 0.2.1) ruby-fogbugz (~> 0.2.1)
ruby-prof (~> 0.16.2) ruby-prof (~> 0.16.2)
rugged (~> 0.25.1.1) rugged (~> 0.25.1.1)
......
...@@ -188,7 +188,7 @@ describe Gitlab::LDAP::Access, lib: true do ...@@ -188,7 +188,7 @@ describe Gitlab::LDAP::Access, lib: true do
end end
end end
describe :update_kerberos_identity do describe '#update_kerberos_identity' do
let(:entry) do let(:entry) do
Net::LDAP::Entry.from_single_ldif_string("dn: cn=foo, dc=bar, dc=com") Net::LDAP::Entry.from_single_ldif_string("dn: cn=foo, dc=bar, dc=com")
end end
...@@ -227,7 +227,7 @@ describe Gitlab::LDAP::Access, lib: true do ...@@ -227,7 +227,7 @@ describe Gitlab::LDAP::Access, lib: true do
end end
end end
describe :update_ssh_keys do describe '#update_ssh_keys' do
let(:ssh_key) { "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrSQHff6a1rMqBdHFt+FwIbytMZ+hJKN3KLkTtOWtSvNIriGhnTdn4rs+tjD/w+z+revytyWnMDM9dS7J8vQi006B16+hc9Xf82crqRoPRDnBytgAFFQY1G/55ql2zdfsC5yvpDOFzuwIJq5dNGsojS82t6HNmmKPq130fzsenFnj5v1pl3OJvk513oduUyKiZBGTroWTn7H/eOPtu7s9MD7pAdEjqYKFLeaKmyidiLmLqQlCRj3Tl2U9oyFg4PYNc0bL5FZJ/Z6t0Ds3i/a2RanQiKxrvgu3GSnUKMx7WIX373baL4jeM7cprRGiOY/1NcS+1cAjfJ8oaxQF/1dYj" } let(:ssh_key) { "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCrSQHff6a1rMqBdHFt+FwIbytMZ+hJKN3KLkTtOWtSvNIriGhnTdn4rs+tjD/w+z+revytyWnMDM9dS7J8vQi006B16+hc9Xf82crqRoPRDnBytgAFFQY1G/55ql2zdfsC5yvpDOFzuwIJq5dNGsojS82t6HNmmKPq130fzsenFnj5v1pl3OJvk513oduUyKiZBGTroWTn7H/eOPtu7s9MD7pAdEjqYKFLeaKmyidiLmLqQlCRj3Tl2U9oyFg4PYNc0bL5FZJ/Z6t0Ds3i/a2RanQiKxrvgu3GSnUKMx7WIX373baL4jeM7cprRGiOY/1NcS+1cAjfJ8oaxQF/1dYj" }
let(:ssh_key_attribute_name) { 'altSecurityIdentities' } let(:ssh_key_attribute_name) { 'altSecurityIdentities' }
let(:entry) do let(:entry) do
...@@ -279,7 +279,7 @@ describe Gitlab::LDAP::Access, lib: true do ...@@ -279,7 +279,7 @@ describe Gitlab::LDAP::Access, lib: true do
end end
end end
describe :update_user_email do describe '#update_user_email' do
let(:entry) { Net::LDAP::Entry.new } let(:entry) { Net::LDAP::Entry.new }
before do before do
......
...@@ -22,7 +22,7 @@ describe LdapGroupLink do ...@@ -22,7 +22,7 @@ describe LdapGroupLink do
end end
end end
describe :provider do describe 'provider' do
it "shows the set value" do it "shows the set value" do
ldap_group_link.provider = '1235' ldap_group_link.provider = '1235'
expect( ldap_group_link.provider ).to eql '1235' expect( ldap_group_link.provider ).to eql '1235'
......
...@@ -74,11 +74,11 @@ eos ...@@ -74,11 +74,11 @@ eos
) )
end end
describe :build_page do describe '#build_page' do
it { expect(@service.build_page("2ab7834c", 'master')).to eq("http://jenkins.gitlab.org/job/#{project.name}_master/scm/bySHA1/2ab7834c") } it { expect(@service.build_page("2ab7834c", 'master')).to eq("http://jenkins.gitlab.org/job/#{project.name}_master/scm/bySHA1/2ab7834c") }
end end
describe :build_page_with_branch do describe '#build_page with branch' do
it { expect(@service.build_page("2ab7834c", 'test_branch')).to eq("http://jenkins.gitlab.org/job/#{project.name}_test_branch/scm/bySHA1/2ab7834c") } it { expect(@service.build_page("2ab7834c", 'test_branch')).to eq("http://jenkins.gitlab.org/job/#{project.name}_test_branch/scm/bySHA1/2ab7834c") }
end end
end end
...@@ -94,11 +94,11 @@ eos ...@@ -94,11 +94,11 @@ eos
) )
end end
describe :build_page do describe '#build_page' do
it { expect(@service.build_page("2ab7834c", 'master')).to eq("http://jenkins.gitlab.org/job/2/scm/bySHA1/2ab7834c") } it { expect(@service.build_page("2ab7834c", 'master')).to eq("http://jenkins.gitlab.org/job/2/scm/bySHA1/2ab7834c") }
end end
describe :build_page_with_branch do describe '#build_page with branch' do
it { expect(@service.build_page("2ab7834c", 'test_branch')).to eq("http://jenkins.gitlab.org/job/2/scm/bySHA1/2ab7834c") } it { expect(@service.build_page("2ab7834c", 'test_branch')).to eq("http://jenkins.gitlab.org/job/2/scm/bySHA1/2ab7834c") }
end end
end end
......
...@@ -13,7 +13,7 @@ describe MergeRequests::RebaseService do ...@@ -13,7 +13,7 @@ describe MergeRequests::RebaseService do
project.team << [user, :master] project.team << [user, :master]
end end
describe :execute do describe '#execute' do
context 'valid params' do context 'valid params' do
let(:service) { MergeRequests::RebaseService.new(project, user, {}) } let(:service) { MergeRequests::RebaseService.new(project, user, {}) }
......
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