diff options
author | Rémy Coutable <remy@rymai.me> | 2018-09-25 17:08:23 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-09-25 17:08:23 +0000 |
commit | 4ca1afec3534b7e70454bfd99552804c55ca0c83 (patch) | |
tree | 5af5fa65292d604be54db82798d0dffbef1f74db /spec | |
parent | bced03c8b290e0148f7f0aac2d09b2c3df3fa6d6 (diff) | |
parent | f6114939126493409eb7f1bab26eda15ec2d2473 (diff) | |
download | gitlab-ce-4ca1afec3534b7e70454bfd99552804c55ca0c83.tar.gz |
Merge branch 'fix-committer-typo' into 'master'
Fix committer typo
Closes #51808
See merge request gitlab-org/gitlab-ce!21899
Diffstat (limited to 'spec')
-rw-r--r-- | spec/helpers/commits_helper_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/commit_spec.rb | 8 | ||||
-rw-r--r-- | spec/services/merge_requests/rebase_service_spec.rb | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/spec/helpers/commits_helper_spec.rb b/spec/helpers/commits_helper_spec.rb index 4b6c7c33e5b..9c0e55739d6 100644 --- a/spec/helpers/commits_helper_spec.rb +++ b/spec/helpers/commits_helper_spec.rb @@ -37,7 +37,7 @@ describe CommitsHelper do .not_to include('onmouseover="alert(1)"') end - it 'escapes the commiter name' do + it 'escapes the committer name' do user = build_stubbed(:user, name: 'Foo <script>alert("XSS")</script>') commit = double(committer: user, committer_name: '', committer_email: '') diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb index a6957095166..ed41ff7a0fa 100644 --- a/spec/models/commit_spec.rb +++ b/spec/models/commit_spec.rb @@ -270,11 +270,11 @@ eos let(:issue) { create :issue, project: project } let(:other_project) { create(:project, :public) } let(:other_issue) { create :issue, project: other_project } - let(:commiter) { create :user } + let(:committer) { create :user } before do - project.add_developer(commiter) - other_project.add_developer(commiter) + project.add_developer(committer) + other_project.add_developer(committer) end it 'detects issues that this commit is marked as closing' do @@ -282,7 +282,7 @@ eos allow(commit).to receive_messages( safe_message: "Fixes ##{issue.iid} and #{ext_ref}", - committer_email: commiter.email + committer_email: committer.email ) expect(commit.closes_issues).to include(issue) diff --git a/spec/services/merge_requests/rebase_service_spec.rb b/spec/services/merge_requests/rebase_service_spec.rb index 2703da7ae44..427a2d63a88 100644 --- a/spec/services/merge_requests/rebase_service_spec.rb +++ b/spec/services/merge_requests/rebase_service_spec.rb @@ -87,7 +87,7 @@ describe MergeRequests::RebaseService do expect(merge_request.reload.rebase_commit_sha).to eq(head_sha) end - it 'logs correct author and commiter' do + it 'logs correct author and committer' do head_commit = merge_request.source_project.repository.commit(merge_request.source_branch) expect(head_commit.author_email).to eq('dmitriy.zaporozhets@gmail.com') |