diff options
| author | Izaak Alpert <ialpert@blackberry.com> | 2013-07-16 17:14:03 -0400 |
|---|---|---|
| committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-17 22:48:03 -0400 |
| commit | d99594273d57b2d5ed7c748b3185712960b89478 (patch) | |
| tree | 5f5d6da6011465e3521c7c3ab09ec7a38dbef37a /features | |
| parent | 128f2845770b7a6d553ee764cdbbe63da5ba9e84 (diff) | |
| download | gitlab-ce-d99594273d57b2d5ed7c748b3185712960b89478.tar.gz | |
Style changes from review with @randx
-Some changes around calling origional methods for !for_fork? merge requests. Other changes to follow
Change-Id: I009c716ce2475b9efa3fd07aee9215fca7a1c150
Diffstat (limited to 'features')
| -rw-r--r-- | features/project/forked_merge_requests.feature | 2 | ||||
| -rw-r--r-- | features/steps/project/project_forked_merge_requests.rb | 32 |
2 files changed, 16 insertions, 18 deletions
diff --git a/features/project/forked_merge_requests.feature b/features/project/forked_merge_requests.feature index ef8c3cb3dee..34e7cb5a29d 100644 --- a/features/project/forked_merge_requests.feature +++ b/features/project/forked_merge_requests.feature @@ -20,7 +20,6 @@ Feature: Project Forked Merge Requests And I submit the merge request Then I should see merge request "Merge Request On Forked Project" - @javascript Scenario: I should see a push widget for forked merge requests Given project "Forked Shop" has push event @@ -39,7 +38,6 @@ Feature: Project Forked Merge Requests And I click link edit "Merge Request On Forked Project" Then I see the edit page prefilled for "Merge Request On Forked Project" - @javascript Scenario: I cannot submit an invalid merge request Given I visit project "Forked Shop" merge requests page diff --git a/features/steps/project/project_forked_merge_requests.rb b/features/steps/project/project_forked_merge_requests.rb index 01689859cd7..16cb628b41c 100644 --- a/features/steps/project/project_forked_merge_requests.rb +++ b/features/steps/project/project_forked_merge_requests.rb @@ -109,25 +109,25 @@ class ProjectForkedMergeRequests < Spinach::FeatureSteps @forked_project = Project.find_by_name("Forked Shop") data = { - before: "0000000000000000000000000000000000000000", - after: "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e", - ref: "refs/heads/new_design", - user_id: @user.id, - user_name: @user.name, - repository: { - name: @forked_project.name, - url: "localhost/rubinius", - description: "", - homepage: "localhost/rubinius", - private: true - } + before: "0000000000000000000000000000000000000000", + after: "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e", + ref: "refs/heads/new_design", + user_id: @user.id, + user_name: @user.name, + repository: { + name: @forked_project.name, + url: "localhost/rubinius", + description: "", + homepage: "localhost/rubinius", + private: true + } } @event = Event.create( - project: @forked_project, - action: Event::PUSHED, - data: data, - author_id: @user.id + project: @forked_project, + action: Event::PUSHED, + data: data, + author_id: @user.id ) end |
