diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-26 16:17:07 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-26 16:17:07 +0000 |
| commit | 06ab7d89f9835205ee4d2dfd64aac671a7efa891 (patch) | |
| tree | aa5d7722bd7f92ccb47d0eb07138de3364fdaa01 /spec | |
| parent | 2fa77909ae6161ca21076ddbbcbfe52c7a4f7e40 (diff) | |
| parent | e14d517b61233ac0a2cc2fe90f3a745133cf789c (diff) | |
| download | gitlab-ce-06ab7d89f9835205ee4d2dfd64aac671a7efa891.tar.gz | |
Merge branch 'rs-issue-1887' into 'master'
Reorder MergeRequestTabs constructor
The tab was being activated before we set the `[commits|diffs]Loaded`
variable, so even when the `/diffs` route is accessed directly, like
from the "Side-by-side" link, the tab was being loaded from its default
source.
Fixes #1887
See merge request !892
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/features/notes_on_merge_requests_spec.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb index 12ab4b844d8..ad37b589b84 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -223,8 +223,7 @@ describe 'Comments' do sample_compare.changes.last[:line_code] end - def click_diff_line(data = nil) - data ||= line_code - find("button[data-line-code=\"#{data}\"]").click + def click_diff_line(data = line_code) + page.find(%Q{button[data-line-code="#{data}"]}, visible: false).click end end |