diff options
author | Robert Speicher <robert@gitlab.com> | 2015-09-17 00:42:25 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2015-09-17 00:42:25 +0000 |
commit | e3041b90dc4b02a1bd9b68e820d19f4a58488940 (patch) | |
tree | a78f416e3509e6e652cc3e73741b6ac3c673e228 | |
parent | c44014c8a1e637418de8188fa475feb4fd15f90f (diff) | |
parent | 510b17d79d78072469aae76195e8dac7ee416250 (diff) | |
download | gitlab-ci-e3041b90dc4b02a1bd9b68e820d19f4a58488940.tar.gz |
Merge branch 'rs-fix-specs' into 'master'
Remove old should syntax from spec
See merge request !250
-rw-r--r-- | spec/models/project_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index fcd4ee7..b74bc5e 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -67,7 +67,7 @@ describe Project do it 'returns ordered list of commits' do commit1 = FactoryGirl.create :commit, committed_at: 1.hour.ago, project: project commit2 = FactoryGirl.create :commit, committed_at: 2.hour.ago, project: project - project.commits.should == [commit2, commit1] + expect(project.commits).to eq [commit2, commit1] end it 'returns commits ordered by committed_at and id, with nulls last' do @@ -75,7 +75,7 @@ describe Project do commit2 = FactoryGirl.create :commit, committed_at: nil, project: project commit3 = FactoryGirl.create :commit, committed_at: 2.hour.ago, project: project commit4 = FactoryGirl.create :commit, committed_at: nil, project: project - project.commits.should == [commit2, commit4, commit3, commit1] + expect(project.commits).to eq [commit2, commit4, commit3, commit1] end end |