diff options
author | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-14 17:02:16 +0100 |
---|---|---|
committer | Sebastian Ziebell <sebastian.ziebell@asquera.de> | 2013-02-14 17:02:16 +0100 |
commit | c8b92a4be2d526a128e17c784bd9af93e5ee91f5 (patch) | |
tree | 9721643ba758ef55cc0bd12a539b66d60795421c /spec | |
parent | c305eb31aa1cf1aec24b907e0db1d7b2084400dc (diff) | |
parent | ed3f44085e01f50864ce840f007a50d2154df6f5 (diff) | |
download | gitlab-ce-c8b92a4be2d526a128e17c784bd9af93e5ee91f5.tar.gz |
Merge branch 'master' into fixes/api
Diffstat (limited to 'spec')
-rw-r--r-- | spec/factories.rb | 2 | ||||
-rw-r--r-- | spec/models/event_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/project_hooks_spec.rb | 2 | ||||
-rw-r--r-- | spec/observers/activity_observer_spec.rb | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/spec/factories.rb b/spec/factories.rb index ae9066cb30c..d2e9f48c47b 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 82b46b68b64..cc78993905f 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 3559c72f6f0..65205538213 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 6af5d070888..3d503027360 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 |