summaryrefslogtreecommitdiff
path: root/spec/models/ci
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2015-12-15 00:53:52 -0200
committerGabriel Mazetto <gabriel@gitlab.com>2015-12-15 00:53:52 -0200
commitb5291f95996743067bbec5a32f9c6cf0d34b36c7 (patch)
tree9933fe5c9c224a175fb49fceff829b8b4441c970 /spec/models/ci
parentd1f1c5c60bfd58f966671d7895c1ef612e8f8897 (diff)
downloadgitlab-ce-b5291f95996743067bbec5a32f9c6cf0d34b36c7.tar.gz
Fixed Rubocop offenses
Diffstat (limited to 'spec/models/ci')
-rw-r--r--spec/models/ci/commit_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index ac61c8fb525..b193e16e7f8 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -37,14 +37,14 @@ describe Ci::Commit, models: true do
it 'returns ordered list of commits' do
commit1 = FactoryGirl.create :ci_commit, committed_at: 1.hour.ago, project: project
- commit2 = FactoryGirl.create :ci_commit, committed_at: 2.hour.ago, project: project
+ commit2 = FactoryGirl.create :ci_commit, committed_at: 2.hours.ago, project: project
expect(project.ci_commits.ordered).to eq([commit2, commit1])
end
it 'returns commits ordered by committed_at and id, with nulls last' do
commit1 = FactoryGirl.create :ci_commit, committed_at: 1.hour.ago, project: project
commit2 = FactoryGirl.create :ci_commit, committed_at: nil, project: project
- commit3 = FactoryGirl.create :ci_commit, committed_at: 2.hour.ago, project: project
+ commit3 = FactoryGirl.create :ci_commit, committed_at: 2.hours.ago, project: project
commit4 = FactoryGirl.create :ci_commit, committed_at: nil, project: project
expect(project.ci_commits.ordered).to eq([commit2, commit4, commit3, commit1])
end