diff --git a/app/models/event.rb b/app/models/event.rb
index 97b1e3306aa95ee08632c2b95e11cb498f1576fc..18422e192a4870c4bf3c54e55111df57dfeef572 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -20,15 +20,15 @@ class Event < ActiveRecord::Base
default_scope where("author_id IS NOT NULL")
- Created = 1
- Updated = 2
- Closed = 3
- Reopened = 4
- Pushed = 5
- Commented = 6
- Merged = 7
- Joined = 8 # User joined project
- Left = 9 # User left project
+ CREATED = 1
+ UPDATED = 2
+ CLOSED = 3
+ REOPENED = 4
+ PUSHED = 5
+ COMMENTED = 6
+ MERGED = 7
+ JOINED = 8 # User joined project
+ LEFT = 9 # User left project
delegate :name, :email, to: :author, prefix: true, allow_nil: true
delegate :title, to: :issue, prefix: true, allow_nil: true
@@ -43,15 +43,15 @@ class Event < ActiveRecord::Base
# Scopes
scope :recent, -> { order("created_at DESC") }
- scope :code_push, -> { where(action: Pushed) }
+ scope :code_push, -> { where(action: PUSHED) }
scope :in_projects, ->(project_ids) { where(project_id: project_ids).recent }
class << self
def determine_action(record)
if [Issue, MergeRequest].include? record.class
- Event::Created
+ Event::CREATED
elsif record.kind_of? Note
- Event::Commented
+ Event::COMMENTED
end
end
end
@@ -79,19 +79,19 @@ class Event < ActiveRecord::Base
end
def push?
- action == self.class::Pushed && valid_push?
+ action == self.class::PUSHED && valid_push?
end
def merged?
- action == self.class::Merged
+ action == self.class::MERGED
end
def closed?
- action == self.class::Closed
+ action == self.class::CLOSED
end
def reopened?
- action == self.class::Reopened
+ action == self.class::REOPENED
end
def milestone?
@@ -111,11 +111,11 @@ class Event < ActiveRecord::Base
end
def joined?
- action == Joined
+ action == JOINED
end
def left?
- action == Left
+ action == LEFT
end
def membership_changed?
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index b6ea85f6507c62e629a526e61d781fc59a0637db..345b8d6e07d53344a41587aa7e420dd23edf74e1 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -133,11 +133,11 @@ class MergeRequest < ActiveRecord::Base
end
def merge_event
- self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::Merged).last
+ self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::MERGED).last
end
def closed_event
- self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::Closed).last
+ self.project.events.where(target_id: self.id, target_type: "MergeRequest", action: Event::CLOSED).last
end
def commits
@@ -184,7 +184,7 @@ class MergeRequest < ActiveRecord::Base
self.mark_as_merged!
Event.create(
project: self.project,
- action: Event::Merged,
+ action: Event::MERGED,
target_id: self.id,
target_type: "MergeRequest",
author_id: user_id
diff --git a/app/models/project.rb b/app/models/project.rb
index acc1b8d232870682b4dc24f787a5cd782f733d1d..15b2d858b62695dd7492b8e3201b8db9beafe0b5 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -103,7 +103,7 @@ class Project < ActiveRecord::Base
end
def with_push
- includes(:events).where('events.action = ?', Event::Pushed)
+ includes(:events).where('events.action = ?', Event::PUSHED)
end
def active
@@ -336,7 +336,7 @@ class Project < ActiveRecord::Base
def observe_push(data)
Event.create(
project: self,
- action: Event::Pushed,
+ action: Event::PUSHED,
data: data,
author_id: data[:user_id]
)
diff --git a/app/observers/activity_observer.rb b/app/observers/activity_observer.rb
index c188e5720ac3cb2a3e299aae747ccb01e472dee3..b568bb6b763718b3c82b14a641b98972bf337734 100644
--- a/app/observers/activity_observer.rb
+++ b/app/observers/activity_observer.rb
@@ -26,7 +26,7 @@ class ActivityObserver < ActiveRecord::Observer
project: record.project,
target_id: record.id,
target_type: record.class.name,
- action: (record.closed ? Event::Closed : Event::Reopened),
+ action: (record.closed ? Event::CLOSED : Event::REOPENED),
author_id: record.author_id_of_changes
)
end
diff --git a/app/observers/users_project_observer.rb b/app/observers/users_project_observer.rb
index b969d6a13ef02faf36d664f442a2fc91deb7e680..66b421753f0e741c52653032b25e2c3aeff4fac6 100644
--- a/app/observers/users_project_observer.rb
+++ b/app/observers/users_project_observer.rb
@@ -7,7 +7,7 @@ class UsersProjectObserver < ActiveRecord::Observer
def after_create(users_project)
Event.create(
project_id: users_project.project.id,
- action: Event::Joined,
+ action: Event::JOINED,
author_id: users_project.user.id
)
end
@@ -15,7 +15,7 @@ class UsersProjectObserver < ActiveRecord::Observer
def after_destroy(users_project)
Event.create(
project_id: users_project.project.id,
- action: Event::Left,
+ action: Event::LEFT,
author_id: users_project.user.id
)
end
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb
index 8c13ad0e151b57366c2cc7e144384a3d63cd5639..c6832056435a415e562d3b17c0fc34d3049f18db 100644
--- a/features/steps/dashboard/dashboard.rb
+++ b/features/steps/dashboard/dashboard.rb
@@ -33,7 +33,7 @@ class Dashboard < Spinach::FeatureSteps
Event.create(
project: project,
author_id: user.id,
- action: Event::Joined
+ action: Event::JOINED
)
end
@@ -47,7 +47,7 @@ class Dashboard < Spinach::FeatureSteps
Event.create(
project: project,
author_id: user.id,
- action: Event::Left
+ action: Event::LEFT
)
end
diff --git a/features/steps/dashboard/dashboard_event_filters.rb b/features/steps/dashboard/dashboard_event_filters.rb
index bfc053631ab241c416ab007504e63c0e0f5bb608..afa15c31332b918da0a1a6e131e51dc04a882dab 100644
--- a/features/steps/dashboard/dashboard_event_filters.rb
+++ b/features/steps/dashboard/dashboard_event_filters.rb
@@ -45,7 +45,7 @@ class EventFilters < Spinach::FeatureSteps
@event = Event.create(
project: @project,
- action: Event::Pushed,
+ action: Event::PUSHED,
data: data,
author_id: @user.id
)
@@ -56,7 +56,7 @@ class EventFilters < Spinach::FeatureSteps
Event.create(
project: @project,
author_id: user.id,
- action: Event::Joined
+ action: Event::JOINED
)
end
@@ -64,7 +64,7 @@ class EventFilters < Spinach::FeatureSteps
merge_request = create :merge_request, author: @user, project: @project
Event.create(
project: @project,
- action: Event::Merged,
+ action: Event::MERGED,
target_id: merge_request.id,
target_type: "MergeRequest",
author_id: @user.id
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index 1623edb80d00af8ef51d92d709928bd137521263..5e61a4132c003cc57cf505bf964dcc35dadd0f27 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -33,7 +33,7 @@ module SharedProject
@event = Event.create(
project: @project,
- action: Event::Pushed,
+ action: Event::PUSHED,
data: data,
author_id: @user.id
)
diff --git a/lib/event_filter.rb b/lib/event_filter.rb
index 14ab0193bf125a6e872d5979a31aae356401ed1a..9b4b8c3801aca1894d545c4387eff18c6812c803 100644
--- a/lib/event_filter.rb
+++ b/lib/event_filter.rb
@@ -37,15 +37,15 @@ class EventFilter
filter = params.dup
actions = []
- actions << Event::Pushed if filter.include? 'push'
- actions << Event::Merged if filter.include? 'merged'
+ actions << Event::PUSHED if filter.include? 'push'
+ actions << Event::MERGED if filter.include? 'merged'
if filter.include? 'team'
- actions << Event::Joined
- actions << Event::Left
+ actions << Event::JOINED
+ actions << Event::LEFT
end
- actions << Event::Commented if filter.include? 'comments'
+ actions << Event::COMMENTED if filter.include? 'comments'
events = events.where(action: actions)
end
diff --git a/spec/factories.rb b/spec/factories.rb
index ae9066cb30c0b1f27f028fec0792a5e2ef812215..d2e9f48c47ba81ed31df1dd1da781d2b2f55d80a 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -123,7 +123,7 @@ FactoryGirl.define do
factory :event do
factory :closed_issue_event do
project
- action { Event::Closed }
+ action { Event::CLOSED }
target factory: :closed_issue
author factory: :user
end
diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index 82b46b68b64d5cb3e11848bdf22e47016ea29083..cc78993905f04fe5e1560d89240c4e6a5b037e9c 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -52,7 +52,7 @@ describe Event do
@event = Event.create(
project: project,
- action: Event::Pushed,
+ action: Event::PUSHED,
data: data,
author_id: @user.id
)
diff --git a/spec/models/project_hooks_spec.rb b/spec/models/project_hooks_spec.rb
index 3559c72f6f0f785d07ef5685a233bd32e6757027..65205538213c66b25f15bbc8b443390aad6c3003 100644
--- a/spec/models/project_hooks_spec.rb
+++ b/spec/models/project_hooks_spec.rb
@@ -19,7 +19,7 @@ describe Project, "Hooks" do
event.should_not be_nil
event.project.should == project
- event.action.should == Event::Pushed
+ event.action.should == Event::PUSHED
event.data.should == data
end
end
diff --git a/spec/observers/activity_observer_spec.rb b/spec/observers/activity_observer_spec.rb
index 6af5d070888f4e92faad45c4436ade9ee795ca0b..3d5030273609b666d7f91811b267c4e600ff824a 100644
--- a/spec/observers/activity_observer_spec.rb
+++ b/spec/observers/activity_observer_spec.rb
@@ -17,7 +17,7 @@ describe ActivityObserver do
end
it_should_be_valid_event
- it { @event.action.should == Event::Created }
+ it { @event.action.should == Event::CREATED }
it { @event.target.should == @merge_request }
end
@@ -30,7 +30,7 @@ describe ActivityObserver do
end
it_should_be_valid_event
- it { @event.action.should == Event::Created }
+ it { @event.action.should == Event::CREATED }
it { @event.target.should == @issue }
end
@@ -44,7 +44,7 @@ describe ActivityObserver do
end
it_should_be_valid_event
- it { @event.action.should == Event::Commented }
+ it { @event.action.should == Event::COMMENTED }
it { @event.target.should == @note }
end
end