diff options
| author | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-05-07 17:28:15 -0300 |
|---|---|---|
| committer | Oswaldo Ferreira <oswaldo@gitlab.com> | 2017-05-07 17:28:15 -0300 |
| commit | 6125cb973aba8f1867b874d906274dc8edc7b1b2 (patch) | |
| tree | 8e031696f6d3dcafc42e312ee933b59c9c6c87c3 | |
| parent | 96595b2794368a6cc61648cbdb088261f39ddc58 (diff) | |
| download | gitlab-ce-6125cb973aba8f1867b874d906274dc8edc7b1b2.tar.gz | |
Add @javascript and extra wait_for_vue_resource
| -rw-r--r-- | features/project/merge_requests.feature | 2 | ||||
| -rw-r--r-- | features/steps/project/merge_requests/revert.rb | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 7c4b86a0d54..cf9bc9b688a 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -48,10 +48,12 @@ Feature: Project Merge Requests Then I should see "Feature NS-03" in merge requests And I should see "Bug NS-04" in merge requests + @javascript Scenario: I visit an open merge request page Given I click link "Bug NS-04" Then I should see merge request "Bug NS-04" + @javascript Scenario: I visit a merged merge request page Given project "Shop" have "Feature NS-05" merged merge request And I click link "Merged" diff --git a/features/steps/project/merge_requests/revert.rb b/features/steps/project/merge_requests/revert.rb index 66d329273a4..aa76d6f8c48 100644 --- a/features/steps/project/merge_requests/revert.rb +++ b/features/steps/project/merge_requests/revert.rb @@ -1,6 +1,7 @@ class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps include LoginHelpers include GitlabRoutingHelper + include WaitForVueResource step 'I click on the revert button' do find("a[href='#modal-revert-commit']").click @@ -15,6 +16,7 @@ class Spinach::Features::RevertMergeRequests < Spinach::FeatureSteps step 'I should see the revert merge request notice' do page.should have_content('The merge request has been successfully reverted.') + wait_for_vue_resource end step 'I should not see the revert button' do |