diff options
author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-09 22:40:37 +0300 |
---|---|---|
committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-10-13 04:03:15 +0300 |
commit | faa9bd402d3521b3f7b4cc2583f8ef1b3cceb821 (patch) | |
tree | 550ca6c6907c1075d8c0a4092710c500dcf12329 /spec/lib/gitlab/diff/position_spec.rb | |
parent | 3fcab51ebb0f3156b5d732d050b292cd3e081262 (diff) |
Create a Gitlab::Git submodule for conlict-related files
Rename classes to (hopefully) clearer names while we're doing that.
Diffstat (limited to 'spec/lib/gitlab/diff/position_spec.rb')
-rw-r--r-- | spec/lib/gitlab/diff/position_spec.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/spec/lib/gitlab/diff/position_spec.rb b/spec/lib/gitlab/diff/position_spec.rb index 79c47653d55..e0c775bb0e9 100644 --- a/spec/lib/gitlab/diff/position_spec.rb +++ b/spec/lib/gitlab/diff/position_spec.rb @@ -40,7 +40,7 @@ describe Gitlab::Diff::Position do describe "#line_code" do it "returns the correct line code" do - line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, subject.new_line, 0) + line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, subject.new_line, 0) expect(subject.line_code(project.repository)).to eq(line_code) end @@ -108,7 +108,7 @@ describe Gitlab::Diff::Position do describe "#line_code" do it "returns the correct line code" do - line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, subject.new_line, 15) + line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, subject.new_line, 15) expect(subject.line_code(project.repository)).to eq(line_code) end @@ -149,7 +149,7 @@ describe Gitlab::Diff::Position do describe "#line_code" do it "returns the correct line code" do - line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, subject.new_line, subject.old_line) + line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, subject.new_line, subject.old_line) expect(subject.line_code(project.repository)).to eq(line_code) end @@ -189,7 +189,7 @@ describe Gitlab::Diff::Position do describe "#line_code" do it "returns the correct line code" do - line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, 13, subject.old_line) + line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, 13, subject.old_line) expect(subject.line_code(project.repository)).to eq(line_code) end @@ -233,7 +233,7 @@ describe Gitlab::Diff::Position do describe "#line_code" do it "returns the correct line code" do - line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, subject.new_line, 5) + line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, subject.new_line, 5) expect(subject.line_code(project.repository)).to eq(line_code) end @@ -274,7 +274,7 @@ describe Gitlab::Diff::Position do describe "#line_code" do it "returns the correct line code" do - line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, subject.new_line, subject.old_line) + line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, subject.new_line, subject.old_line) expect(subject.line_code(project.repository)).to eq(line_code) end @@ -314,7 +314,7 @@ describe Gitlab::Diff::Position do describe "#line_code" do it "returns the correct line code" do - line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, 4, subject.old_line) + line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, 4, subject.old_line) expect(subject.line_code(project.repository)).to eq(line_code) end @@ -357,7 +357,7 @@ describe Gitlab::Diff::Position do describe "#line_code" do it "returns the correct line code" do - line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, 0, subject.old_line) + line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, 0, subject.old_line) expect(subject.line_code(project.repository)).to eq(line_code) end @@ -399,7 +399,7 @@ describe Gitlab::Diff::Position do describe "#line_code" do it "returns the correct line code" do - line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, subject.new_line, 0) + line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, subject.new_line, 0) expect(subject.line_code(project.repository)).to eq(line_code) end @@ -447,7 +447,7 @@ describe Gitlab::Diff::Position do describe "#line_code" do it "returns the correct line code" do - line_code = Gitlab::Git::DiffLineCode.generate(subject.file_path, 0, subject.old_line) + line_code = Gitlab::Git::Conflict::LineCode.generate(subject.file_path, 0, subject.old_line) expect(subject.line_code(project.repository)).to eq(line_code) end |