summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-09-28 15:33:19 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-09-29 10:47:04 +0200
commit0fa4ab5fd8e0cb775ff4fe75d011ff717f0b3945 (patch)
treeecfe84f8c11e4aca4643570dff1f31eb91ff50f7 /spec
parente60647f011e30c215dfe596e079c616545071732 (diff)
downloadgitlab-ce-0fa4ab5fd8e0cb775ff4fe75d011ff717f0b3945.tar.gz
Rename commits to ci_commits
Diffstat (limited to 'spec')
-rw-r--r--spec/models/ci/project_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/ci/project_spec.rb b/spec/models/ci/project_spec.rb
index fe12160659c..6ccd399e079 100644
--- a/spec/models/ci/project_spec.rb
+++ b/spec/models/ci/project_spec.rb
@@ -75,7 +75,7 @@ describe Ci::Project do
it 'returns ordered list of commits' do
commit1 = FactoryGirl.create :ci_commit, committed_at: 1.hour.ago, gl_project: project
commit2 = FactoryGirl.create :ci_commit, committed_at: 2.hour.ago, gl_project: project
- expect(project.commits).to eq([commit2, commit1])
+ expect(project.ci_commits).to eq([commit2, commit1])
end
it 'returns commits ordered by committed_at and id, with nulls last' do
@@ -83,7 +83,7 @@ describe Ci::Project do
commit2 = FactoryGirl.create :ci_commit, committed_at: nil, gl_project: project
commit3 = FactoryGirl.create :ci_commit, committed_at: 2.hour.ago, gl_project: project
commit4 = FactoryGirl.create :ci_commit, committed_at: nil, gl_project: project
- expect(project.commits).to eq([commit2, commit4, commit3, commit1])
+ expect(project.ci_commits).to eq([commit2, commit4, commit3, commit1])
end
end