diff options
author | Toon Claes <toon@gitlab.com> | 2019-02-28 19:57:34 +0100 |
---|---|---|
committer | Toon Claes <toon@gitlab.com> | 2019-02-28 19:57:34 +0100 |
commit | 62d7990b9bb30cf33ed87017c5c633d1cccc75c2 (patch) | |
tree | c3e1b69c58a412ba1c6f50a0337a23d9f9d6e1a4 /spec/models/diff_discussion_spec.rb | |
parent | f6453eca992a9c142268e78ac782cef98110d183 (diff) | |
download | gitlab-ce-tc-standard-gem.tar.gz |
Ran standardrb --fix on the whole codebasetc-standard-gem
Inspired by https://twitter.com/searls/status/1101137953743613952 I
decided to try https://github.com/testdouble/standard on our codebase.
It's opinionated, but at least it's a _standard_.
Diffstat (limited to 'spec/models/diff_discussion_spec.rb')
-rw-r--r-- | spec/models/diff_discussion_spec.rb | 58 |
1 files changed, 29 insertions, 29 deletions
diff --git a/spec/models/diff_discussion_spec.rb b/spec/models/diff_discussion_spec.rb index 50b19000799..b960bb76920 100644 --- a/spec/models/diff_discussion_spec.rb +++ b/spec/models/diff_discussion_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require "spec_helper" describe DiffDiscussion do include RepoHelpers @@ -9,27 +9,27 @@ describe DiffDiscussion do let(:merge_request) { create(:merge_request, source_project: project, target_project: project) } let(:diff_note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project) } - describe '#reply_attributes' do - it 'includes position and original_position' do + describe "#reply_attributes" do + it "includes position and original_position" do attributes = subject.reply_attributes expect(attributes[:position]).to eq(diff_note.position.to_json) expect(attributes[:original_position]).to eq(diff_note.original_position.to_json) end end - describe '#merge_request_version_params' do + describe "#merge_request_version_params" do let(:merge_request) { create(:merge_request, source_project: project, target_project: project, importing: true) } - let!(:merge_request_diff1) { merge_request.merge_request_diffs.create(head_commit_sha: '6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') } + let!(:merge_request_diff1) { merge_request.merge_request_diffs.create(head_commit_sha: "6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9") } let!(:merge_request_diff2) { merge_request.merge_request_diffs.create(head_commit_sha: nil) } - let!(:merge_request_diff3) { merge_request.merge_request_diffs.create(head_commit_sha: '5937ac0a7beb003549fc5fd26fc247adbce4a52e') } + let!(:merge_request_diff3) { merge_request.merge_request_diffs.create(head_commit_sha: "5937ac0a7beb003549fc5fd26fc247adbce4a52e") } - context 'when the discussion is active' do - it 'returns an empty hash, which will end up showing the latest version' do + context "when the discussion is active" do + it "returns an empty hash, which will end up showing the latest version" do expect(subject.merge_request_version_params).to eq({}) end end - context 'when the discussion is on an older merge request version' do + context "when the discussion is on an older merge request version" do let(:position) do Gitlab::Diff::Position.new( old_path: ".gitmodules", @@ -47,24 +47,24 @@ describe DiffDiscussion do diff_note.save! end - context 'when commit_id is not present' do - it 'returns the diff ID for the version to show' do + context "when commit_id is not present" do + it "returns the diff ID for the version to show" do expect(subject.merge_request_version_params).to eq(diff_id: merge_request_diff1.id) end end - context 'when commit_id is present' do + context "when commit_id is present" do before do - diff_note.update_attribute(:commit_id, 'commit_123') + diff_note.update_attribute(:commit_id, "commit_123") end - it 'includes the commit_id in the result' do - expect(subject.merge_request_version_params).to eq(diff_id: merge_request_diff1.id, commit_id: 'commit_123') + it "includes the commit_id in the result" do + expect(subject.merge_request_version_params).to eq(diff_id: merge_request_diff1.id, commit_id: "commit_123") end end end - context 'when the discussion is on a comparison between merge request versions' do + context "when the discussion is on a comparison between merge request versions" do let(:position) do Gitlab::Diff::Position.new( old_path: ".gitmodules", @@ -82,24 +82,24 @@ describe DiffDiscussion do diff_note.save! end - context 'when commit_id is not present' do - it 'returns the diff ID and start sha of the versions to compare' do + context "when commit_id is not present" do + it "returns the diff ID and start sha of the versions to compare" do expect(subject.merge_request_version_params).to eq(diff_id: merge_request_diff3.id, start_sha: merge_request_diff1.head_commit_sha) end end - context 'when commit_id is present' do + context "when commit_id is present" do before do - diff_note.update_attribute(:commit_id, 'commit_123') + diff_note.update_attribute(:commit_id, "commit_123") end - it 'includes the commit_id in the result' do - expect(subject.merge_request_version_params).to eq(diff_id: merge_request_diff3.id, start_sha: merge_request_diff1.head_commit_sha, commit_id: 'commit_123') + it "includes the commit_id in the result" do + expect(subject.merge_request_version_params).to eq(diff_id: merge_request_diff3.id, start_sha: merge_request_diff1.head_commit_sha, commit_id: "commit_123") end end end - context 'when the discussion does not have a merge request version' do + context "when the discussion does not have a merge request version" do let(:diff_note) { create(:diff_note_on_merge_request, noteable: merge_request, project: project, diff_refs: project.commit(sample_commit.id).diff_refs) } before do @@ -107,19 +107,19 @@ describe DiffDiscussion do diff_note.save! end - context 'when commit_id is not present' do - it 'returns empty hash' do + context "when commit_id is not present" do + it "returns empty hash" do expect(subject.merge_request_version_params).to eq(nil) end end - context 'when commit_id is present' do + context "when commit_id is present" do before do - diff_note.update_attribute(:commit_id, 'commit_123') + diff_note.update_attribute(:commit_id, "commit_123") end - it 'returns the commit_id' do - expect(subject.merge_request_version_params).to eq(commit_id: 'commit_123') + it "returns the commit_id" do + expect(subject.merge_request_version_params).to eq(commit_id: "commit_123") end end end |