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 /features | |
| parent | c305eb31aa1cf1aec24b907e0db1d7b2084400dc (diff) | |
| parent | ed3f44085e01f50864ce840f007a50d2154df6f5 (diff) | |
| download | gitlab-ce-c8b92a4be2d526a128e17c784bd9af93e5ee91f5.tar.gz | |
Merge branch 'master' into fixes/api
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/dashboard/dashboard.rb | 4 | ||||
| -rw-r--r-- | features/steps/dashboard/dashboard_event_filters.rb | 6 | ||||
| -rw-r--r-- | features/steps/shared/project.rb | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb index 8c13ad0e151..c6832056435 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 bfc053631ab..afa15c31332 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 1623edb80d0..5e61a4132c0 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 ) |