diff options
| author | Tim Masliuchenko <insside@gmail.com> | 2016-07-21 21:44:12 +0300 |
|---|---|---|
| committer | Tim Masliuchenko <insside@gmail.com> | 2016-08-04 09:09:59 +0300 |
| commit | b6d545df51d7c3b4e572b40cdafb7efeb78edaf4 (patch) | |
| tree | 589b0b788433975c77b9aabc43b6f36650dce35c /features | |
| parent | 95e5b4634db48656317242e2691388f68e8dcd37 (diff) | |
| download | gitlab-ce-b6d545df51d7c3b4e572b40cdafb7efeb78edaf4.tar.gz | |
Add unfold links for Side-by-Side view
Diffstat (limited to 'features')
| -rw-r--r-- | features/project/merge_requests.feature | 9 | ||||
| -rw-r--r-- | features/steps/project/merge_requests.rb | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index 21768c15c17..6bac6011467 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -237,6 +237,15 @@ Feature: Project Merge Requests Then I should see additional file lines @javascript + Scenario: I unfold diff in Side-by-Side view + Given project "Shop" have "Bug NS-05" open merge request with diffs inside + And I visit merge request page "Bug NS-05" + And I click on the Changes tab + And I click Side-by-side Diff tab + And I unfold diff + Then I should see additional file lines + + @javascript Scenario: I show comments on a merge request side-by-side diff with comments in multiple files Given project "Shop" have "Bug NS-05" open merge request with diffs inside And I visit merge request page "Bug NS-05" diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index da848afd48e..a02a54923a5 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -477,6 +477,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I click Side-by-side Diff tab' do find('a', text: 'Side-by-side').trigger('click') + + # Waits for load + expect(page).to have_css('.parallel') end step 'I should see comments on the side-by-side diff page' do |