summaryrefslogtreecommitdiff
path: root/spec/models/project_spec.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-08-11 14:40:03 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-08-11 14:40:03 +0000
commite80a893ff0ea8466099f6478183631af55933db2 (patch)
tree58b07a7faf58a768711a975715f91c1e6334d9d8 /spec/models/project_spec.rb
parent9c11894a656603c59c03d8f35fbe8cdf7a1ad0c4 (diff)
parentaac1de46c9be659b74da12f704412f38292974db (diff)
downloadgitlab-ce-e80a893ff0ea8466099f6478183631af55933db2.tar.gz
Merge branch 'split-events-into-push-events' into 'master'
Use a separate table for storing push events See merge request !12463
Diffstat (limited to 'spec/models/project_spec.rb')
-rw-r--r--spec/models/project_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index a28e92446ea..d9ab44dc49f 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -485,7 +485,7 @@ describe Project do
describe 'last_activity' do
it 'alias last_activity to last_event' do
- last_event = create(:event, project: project)
+ last_event = create(:event, :closed, project: project)
expect(project.last_activity).to eq(last_event)
end
@@ -493,7 +493,7 @@ describe Project do
describe 'last_activity_date' do
it 'returns the creation date of the project\'s last event if present' do
- new_event = create(:event, project: project, created_at: Time.now)
+ new_event = create(:event, :closed, project: project, created_at: Time.now)
project.reload
expect(project.last_activity_at.to_i).to eq(new_event.created_at.to_i)