Commit 08ed58ac authored by Grzegorz Bizon's avatar Grzegorz Bizon Committed by Valery Sizov

Fix Rubocop offenses

parent 2585b425
...@@ -18,7 +18,7 @@ class GeoKeyRefreshWorker ...@@ -18,7 +18,7 @@ class GeoKeyRefreshWorker
key = Key.new(id: key_id, key: key) key = Key.new(id: key_id, key: key)
key.remove_from_shell key.remove_from_shell
else else
fail "Invalid action: #{action}" raise "Invalid action: #{action}"
end end
end end
end end
...@@ -336,7 +336,7 @@ describe Gitlab::GitAccess, lib: true do ...@@ -336,7 +336,7 @@ describe Gitlab::GitAccess, lib: true do
describe 'git annex disabled' do describe 'git annex disabled' do
before { allow(Gitlab.config.gitlab_shell).to receive(:git_annex_enabled).and_return(false) } before { allow(Gitlab.config.gitlab_shell).to receive(:git_annex_enabled).and_return(false) }
it { expect(access.push_access_check(git_annex_changes)).to_not be_allowed } it { expect(access.push_access_check(git_annex_changes)).not_to be_allowed }
end end
end end
...@@ -355,7 +355,7 @@ describe Gitlab::GitAccess, lib: true do ...@@ -355,7 +355,7 @@ describe Gitlab::GitAccess, lib: true do
describe 'git annex disabled' do describe 'git annex disabled' do
before { allow(Gitlab.config.gitlab_shell).to receive(:git_annex_enabled).and_return(false) } before { allow(Gitlab.config.gitlab_shell).to receive(:git_annex_enabled).and_return(false) }
it { expect(access.push_access_check(git_annex_changes)).to_not be_allowed } it { expect(access.push_access_check(git_annex_changes)).not_to be_allowed }
end end
end end
end end
......
...@@ -298,9 +298,9 @@ describe Gitlab::LDAP::GroupSync, lib: true do ...@@ -298,9 +298,9 @@ describe Gitlab::LDAP::GroupSync, lib: true do
group_sync.sync_groups group_sync.sync_groups
expect(group1.members.pluck(:user_id).sort).to eq([user1.id, user2.id].sort) expect(group1.members.pluck(:user_id).sort).to eq([user1.id, user2.id].sort)
expect(group1.members.pluck(:access_level).uniq).to eq([Gitlab::Access::DEVELOPER]) expect(group1.members.uniq.pluck(:access_level)).to eq([Gitlab::Access::DEVELOPER])
expect(group2.members.pluck(:user_id)).to eq([user2.id]) expect(group2.members.pluck(:user_id)).to eq([user2.id])
expect(group2.members.pluck(:access_level).uniq).to eq([Gitlab::Access::MASTER]) expect(group2.members.uniq.pluck(:access_level)).to eq([Gitlab::Access::MASTER])
end end
end end
end end
......
...@@ -44,7 +44,7 @@ describe "Note", elastic: true do ...@@ -44,7 +44,7 @@ describe "Note", elastic: true do
it "does not create ElasticIndexerWorker job for award or system messages" do it "does not create ElasticIndexerWorker job for award or system messages" do
project = create :empty_project project = create :empty_project
expect(ElasticIndexerWorker).to_not receive(:perform_async) expect(ElasticIndexerWorker).not_to receive(:perform_async)
create :note, :system, project: project create :note, :system, project: project
create :note, :award, project: project create :note, :award, project: project
end end
......
...@@ -23,13 +23,13 @@ describe PagesDomain, models: true do ...@@ -23,13 +23,13 @@ describe PagesDomain, models: true do
context 'no domain' do context 'no domain' do
let(:domain) { nil } let(:domain) { nil }
it { is_expected.to_not be_valid } it { is_expected.not_to be_valid }
end end
context 'invalid domain' do context 'invalid domain' do
let(:domain) { '0123123' } let(:domain) { '0123123' }
it { is_expected.to_not be_valid } it { is_expected.not_to be_valid }
end end
context 'domain from .example.com' do context 'domain from .example.com' do
...@@ -37,7 +37,7 @@ describe PagesDomain, models: true do ...@@ -37,7 +37,7 @@ describe PagesDomain, models: true do
before { allow(Settings.pages).to receive(:host).and_return('domain.com') } before { allow(Settings.pages).to receive(:host).and_return('domain.com') }
it { is_expected.to_not be_valid } it { is_expected.not_to be_valid }
end end
end end
...@@ -47,13 +47,13 @@ describe PagesDomain, models: true do ...@@ -47,13 +47,13 @@ describe PagesDomain, models: true do
context 'when only certificate is specified' do context 'when only certificate is specified' do
let(:domain) { build(:pages_domain, :with_certificate) } let(:domain) { build(:pages_domain, :with_certificate) }
it { is_expected.to_not be_valid } it { is_expected.not_to be_valid }
end end
context 'when only key is specified' do context 'when only key is specified' do
let(:domain) { build(:pages_domain, :with_key) } let(:domain) { build(:pages_domain, :with_key) }
it { is_expected.to_not be_valid } it { is_expected.not_to be_valid }
end end
context 'with matching key' do context 'with matching key' do
...@@ -65,7 +65,7 @@ describe PagesDomain, models: true do ...@@ -65,7 +65,7 @@ describe PagesDomain, models: true do
context 'for not matching key' do context 'for not matching key' do
let(:domain) { build(:pages_domain, :with_missing_chain, :with_key) } let(:domain) { build(:pages_domain, :with_missing_chain, :with_key) }
it { is_expected.to_not be_valid } it { is_expected.not_to be_valid }
end end
end end
...@@ -157,6 +157,6 @@ describe PagesDomain, models: true do ...@@ -157,6 +157,6 @@ describe PagesDomain, models: true do
subject { domain.certificate_text } subject { domain.certificate_text }
# We test only existence of output, since the output is long # We test only existence of output, since the output is long
it { is_expected.to_not be_empty } it { is_expected.not_to be_empty }
end end
end end
...@@ -16,7 +16,7 @@ describe API::API, api: true do ...@@ -16,7 +16,7 @@ describe API::API, api: true do
expect(Date.parse(json_response['starts_at'])).to eq Date.today - 1.month expect(Date.parse(json_response['starts_at'])).to eq Date.today - 1.month
expect(Date.parse(json_response['expires_at'])).to eq Date.today + 11.months expect(Date.parse(json_response['expires_at'])).to eq Date.today + 11.months
expect(json_response['active_users']).to eq 1 expect(json_response['active_users']).to eq 1
expect(json_response['licensee']).to_not be_empty expect(json_response['licensee']).not_to be_empty
end end
it 'should deny access if not admin' do it 'should deny access if not admin' do
...@@ -34,7 +34,7 @@ describe API::API, api: true do ...@@ -34,7 +34,7 @@ describe API::API, api: true do
expect(Date.parse(json_response['starts_at'])).to eq Date.today - 1.month expect(Date.parse(json_response['starts_at'])).to eq Date.today - 1.month
expect(Date.parse(json_response['expires_at'])).to eq Date.today + 11.months expect(Date.parse(json_response['expires_at'])).to eq Date.today + 11.months
expect(json_response['active_users']).to eq 1 expect(json_response['active_users']).to eq 1
expect(json_response['licensee']).to_not be_empty expect(json_response['licensee']).not_to be_empty
end end
it 'denies access if not admin' do it 'denies access if not admin' do
......
...@@ -26,7 +26,7 @@ describe PagesService, services: true do ...@@ -26,7 +26,7 @@ describe PagesService, services: true do
before { build.status = status } before { build.status = status }
it 'should not execute worker' do it 'should not execute worker' do
expect(PagesWorker).to_not receive(:perform_async) expect(PagesWorker).not_to receive(:perform_async)
service.execute service.execute
end end
end end
...@@ -40,7 +40,7 @@ describe PagesService, services: true do ...@@ -40,7 +40,7 @@ describe PagesService, services: true do
end end
it 'should not execute worker' do it 'should not execute worker' do
expect(PagesWorker).to_not receive(:perform_async) expect(PagesWorker).not_to receive(:perform_async)
service.execute service.execute
end end
end end
......
...@@ -34,7 +34,7 @@ describe Projects::UpdatePagesService do ...@@ -34,7 +34,7 @@ describe Projects::UpdatePagesService do
it 'limits pages size' do it 'limits pages size' do
stub_application_setting(max_pages_size: 1) stub_application_setting(max_pages_size: 1)
expect(execute).to_not eq(:success) expect(execute).not_to eq(:success)
end end
it 'removes pages after destroy' do it 'removes pages after destroy' do
...@@ -49,29 +49,29 @@ describe Projects::UpdatePagesService do ...@@ -49,29 +49,29 @@ describe Projects::UpdatePagesService do
it 'fails if sha on branch is not latest' do it 'fails if sha on branch is not latest' do
commit.update_attributes(sha: 'old_sha') commit.update_attributes(sha: 'old_sha')
build.update_attributes(artifacts_file: file) build.update_attributes(artifacts_file: file)
expect(execute).to_not eq(:success) expect(execute).not_to eq(:success)
end end
it 'fails for empty file fails' do it 'fails for empty file fails' do
build.update_attributes(artifacts_file: empty_file) build.update_attributes(artifacts_file: empty_file)
expect(execute).to_not eq(:success) expect(execute).not_to eq(:success)
end end
end end
end end
it 'fails to remove project pages when no pages is deployed' do it 'fails to remove project pages when no pages is deployed' do
expect(PagesWorker).to_not receive(:perform_in) expect(PagesWorker).not_to receive(:perform_in)
expect(project.pages_deployed?).to be_falsey expect(project.pages_deployed?).to be_falsey
project.destroy project.destroy
end end
it 'fails if no artifacts' do it 'fails if no artifacts' do
expect(execute).to_not eq(:success) expect(execute).not_to eq(:success)
end end
it 'fails for invalid archive' do it 'fails for invalid archive' do
build.update_attributes(artifacts_file: invalid_file) build.update_attributes(artifacts_file: invalid_file)
expect(execute).to_not eq(:success) expect(execute).not_to eq(:success)
end end
def execute def execute
......
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