Commit 2e521963 authored by Gabriel Mazetto's avatar Gabriel Mazetto

Fix code-style and grammar 🤓

parent 4cb12d79
...@@ -53,7 +53,7 @@ describe MergeRequests::MergeService, services: true do ...@@ -53,7 +53,7 @@ describe MergeRequests::MergeService, services: true do
end end
end end
describe :hooks_validation_pass? do describe '#hooks_validation_pass?' do
let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') } let(:service) { MergeRequests::MergeService.new(project, user, commit_message: 'Awesome message') }
it 'returns true when valid' do it 'returns true when valid' do
...@@ -65,7 +65,7 @@ describe MergeRequests::MergeService, services: true do ...@@ -65,7 +65,7 @@ describe MergeRequests::MergeService, services: true do
allow(project).to receive(:git_hook) { build(:git_hook, commit_message_regex: 'unmatched pattern .*') } allow(project).to receive(:git_hook) { build(:git_hook, commit_message_regex: 'unmatched pattern .*') }
end end
it 'returns false and save error when invalid' do it 'returns false and saves error when invalid' do
expect(service.hooks_validation_pass?(merge_request)).to be_falsey expect(service.hooks_validation_pass?(merge_request)).to be_falsey
expect(merge_request.merge_error).not_to be_empty expect(merge_request.merge_error).not_to be_empty
end end
...@@ -76,7 +76,7 @@ describe MergeRequests::MergeService, services: true do ...@@ -76,7 +76,7 @@ describe MergeRequests::MergeService, services: true do
allow(project).to receive(:git_hook) { build(:git_hook, author_email_regex: '.*@unmatchedemaildomain.com') } allow(project).to receive(:git_hook) { build(:git_hook, author_email_regex: '.*@unmatchedemaildomain.com') }
end end
it 'returns false and save error when invalid' do it 'returns false and saves error when invalid' do
expect(service.hooks_validation_pass?(merge_request)).to be_falsey expect(service.hooks_validation_pass?(merge_request)).to be_falsey
expect(merge_request.merge_error).not_to be_empty expect(merge_request.merge_error).not_to be_empty
end end
......
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