Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
91b5aaf7
Commit
91b5aaf7
authored
May 03, 2017
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update last_repository_updated_at when a push event is created
parent
56db54d3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
8 deletions
+40
-8
app/models/event.rb
app/models/event.rb
+6
-0
spec/models/event_spec.rb
spec/models/event_spec.rb
+34
-8
No files found.
app/models/event.rb
View file @
91b5aaf7
...
@@ -30,6 +30,7 @@ class Event < ActiveRecord::Base
...
@@ -30,6 +30,7 @@ class Event < ActiveRecord::Base
# Callbacks
# Callbacks
after_create
:reset_project_activity
after_create
:reset_project_activity
after_create
:set_last_repository_updated_at
,
if: :push?
# Scopes
# Scopes
scope
:recent
,
->
{
reorder
(
id: :desc
)
}
scope
:recent
,
->
{
reorder
(
id: :desc
)
}
...
@@ -357,4 +358,9 @@ class Event < ActiveRecord::Base
...
@@ -357,4 +358,9 @@ class Event < ActiveRecord::Base
def
recent_update?
def
recent_update?
project
.
last_activity_at
>
RESET_PROJECT_ACTIVITY_INTERVAL
.
ago
project
.
last_activity_at
>
RESET_PROJECT_ACTIVITY_INTERVAL
.
ago
end
end
def
set_last_repository_updated_at
Project
.
unscoped
.
where
(
id:
project_id
).
update_all
(
last_repository_updated_at:
created_at
)
end
end
end
spec/models/event_spec.rb
View file @
91b5aaf7
...
@@ -15,13 +15,39 @@ describe Event, models: true do
...
@@ -15,13 +15,39 @@ describe Event, models: true do
end
end
describe
'Callbacks'
do
describe
'Callbacks'
do
describe
'after_create :reset_project_activity'
do
let
(
:project
)
{
create
(
:empty_project
)
}
let
(
:project
)
{
create
(
:empty_project
)
}
describe
'after_create :reset_project_activity'
do
it
'calls the reset_project_activity method'
do
it
'calls the reset_project_activity method'
do
expect_any_instance_of
(
described_class
).
to
receive
(
:reset_project_activity
)
expect_any_instance_of
(
described_class
).
to
receive
(
:reset_project_activity
)
create_event
(
project
,
project
.
owner
)
create_push_event
(
project
,
project
.
owner
)
end
end
describe
'after_create :set_last_repository_updated_at'
do
context
'with a push event'
do
it
'updates the project last_repository_updated_at'
do
project
.
update
(
last_repository_updated_at:
1
.
year
.
ago
)
create_push_event
(
project
,
project
.
owner
)
project
.
reload
expect
(
project
.
last_repository_updated_at
).
to
be_within
(
1
.
minute
).
of
(
Time
.
now
)
end
end
context
'without a push event'
do
it
'does not update the project last_repository_updated_at'
do
project
.
update
(
last_repository_updated_at:
1
.
year
.
ago
)
create
(
:closed_issue_event
,
project:
project
,
author:
project
.
owner
)
project
.
reload
expect
(
project
.
last_repository_updated_at
).
to
be_within
(
1
.
minute
).
of
(
1
.
year
.
ago
)
end
end
end
end
end
end
end
...
@@ -29,7 +55,7 @@ describe Event, models: true do
...
@@ -29,7 +55,7 @@ describe Event, models: true do
describe
"Push event"
do
describe
"Push event"
do
let
(
:project
)
{
create
(
:empty_project
,
:private
)
}
let
(
:project
)
{
create
(
:empty_project
,
:private
)
}
let
(
:user
)
{
project
.
owner
}
let
(
:user
)
{
project
.
owner
}
let
(
:event
)
{
create_event
(
project
,
user
)
}
let
(
:event
)
{
create_
push_
event
(
project
,
user
)
}
it
do
it
do
expect
(
event
.
push?
).
to
be_truthy
expect
(
event
.
push?
).
to
be_truthy
...
@@ -243,7 +269,7 @@ describe Event, models: true do
...
@@ -243,7 +269,7 @@ describe Event, models: true do
expect
(
project
).
not_to
receive
(
:update_column
).
expect
(
project
).
not_to
receive
(
:update_column
).
with
(
:last_activity_at
,
a_kind_of
(
Time
))
with
(
:last_activity_at
,
a_kind_of
(
Time
))
create_event
(
project
,
project
.
owner
)
create_
push_
event
(
project
,
project
.
owner
)
end
end
end
end
...
@@ -251,11 +277,11 @@ describe Event, models: true do
...
@@ -251,11 +277,11 @@ describe Event, models: true do
it
'updates the project'
do
it
'updates the project'
do
project
.
update
(
last_activity_at:
1
.
year
.
ago
)
project
.
update
(
last_activity_at:
1
.
year
.
ago
)
create_event
(
project
,
project
.
owner
)
create_
push_
event
(
project
,
project
.
owner
)
project
.
reload
project
.
reload
project
.
last_activity_at
<=
1
.
minute
.
ago
expect
(
project
.
last_activity_at
).
to
be_within
(
1
.
minute
).
of
(
Time
.
now
)
end
end
end
end
end
end
...
@@ -278,7 +304,7 @@ describe Event, models: true do
...
@@ -278,7 +304,7 @@ describe Event, models: true do
end
end
end
end
def
create_event
(
project
,
user
,
attrs
=
{})
def
create_
push_
event
(
project
,
user
,
attrs
=
{})
data
=
{
data
=
{
before:
Gitlab
::
Git
::
BLANK_SHA
,
before:
Gitlab
::
Git
::
BLANK_SHA
,
after:
"0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e"
,
after:
"0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e"
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment