diff options
author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-26 02:57:22 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-26 02:57:22 +0000 |
commit | cd6baa141528f6d4e676715c2d3995fdc05e9544 (patch) | |
tree | 2cd7d87f871738c4ab13099fb78486b572a2e16f /features | |
parent | 78391fe5a06136c2650fe0e1fa434693bae8002b (diff) | |
parent | 9b8d5c4ab4e5dc544891f37fa6dd91134577e313 (diff) | |
download | gitlab-ce-cd6baa141528f6d4e676715c2d3995fdc05e9544.tar.gz |
Merge branch 'line-is-wrong-test' into 'master'
Make test element selection more specific to fix constantly failing test.
Fixes #2051.
The problem was that there were two `.note-text` elements matching `.files [id^=diff]:nth-child(2) .note-text`, one for the new comment, and one for the (currently hidden) new comment form. The latter one was selected but currently invisible, triggering the following error in poltergeist:
> The element you are trying to interact with is either not part of the DOM, or is not currently visible on the page (perhaps display: none is set). It's possible the element has been replaced by another element and you meant to interact with the new element. If so you need to do a new 'find' in order to get a reference to the new element.
This caused the test to fail.
See merge request !1592
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/project/merge_requests.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index d358f1d875f..263f2ef2438 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -213,7 +213,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I should see a comment like "Line is wrong" in the second file' do - within '.files [id^=diff]:nth-child(2) .note-text' do + within '.files [id^=diff]:nth-child(2) .note-body > .note-text' do page.should have_visible_content "Line is wrong" end end @@ -225,7 +225,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps end step 'I should see a comment like "Line is wrong here" in the second file' do - within '.files [id^=diff]:nth-child(2) .note-text' do + within '.files [id^=diff]:nth-child(2) .note-body > .note-text' do page.should have_visible_content "Line is wrong here" end end @@ -238,7 +238,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps click_button "Add Comment" end - within ".files [id^=diff]:nth-child(1) .note-text" do + within ".files [id^=diff]:nth-child(1) .note-body > .note-text" do page.should have_content "Line is correct" end end |