Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/270724
Change subject: [BrowserTest] Fix `ve.init is undefined` error messages in
Selenium tests
......................................................................
[BrowserTest] Fix `ve.init is undefined` error messages in Selenium tests
Bug: T126966
Change-Id: I9789ca42717133120197c4625bb8dad4ea496aa8
---
M modules/ve-mw/tests/browser/features/multiedit_workflow.feature
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
2 files changed, 14 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/24/270724/1
diff --git a/modules/ve-mw/tests/browser/features/multiedit_workflow.feature
b/modules/ve-mw/tests/browser/features/multiedit_workflow.feature
index b85d09c..8b92549 100644
--- a/modules/ve-mw/tests/browser/features/multiedit_workflow.feature
+++ b/modules/ve-mw/tests/browser/features/multiedit_workflow.feature
@@ -11,7 +11,8 @@
to test multiple page edits within a single session.
Scenario: Make multiple edits to the same article
- Given I enter and save the first edit
+ Given I am on the Multiple edits page
+ And I enter and save the first edit
And I enter and save a second edit
And I enter and save a third edit
Then the saved page should contain all three edits.
diff --git
a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
index cb7bea6..8ef1ac3 100644
--- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
+++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
@@ -200,16 +200,25 @@
div(:media_alternative_block, class: 'oo-ui-layout oo-ui-iconElement
oo-ui-labelElement oo-ui-fieldsetLayout', index: 2)
div(:media_advanced_settings, class: 'oo-ui-outlineOptionWidget-level-0',
index: 1)
+ def visual_editor_element(script)
+ begin
+ browser.execute_script script
+ rescue Selenium::WebDriver::Error::JavascriptError => e
+ else
+ e = nil
+ end while e.class == Selenium::WebDriver::Error::JavascriptError
+ browser.execute_script script
+ end
def ve_bold_text_element
- @browser.execute_script('return
ve.init.target.getToolbar().items[2].tools.bold.$link[0]')
+ visual_editor_element('return
ve.init.target.getToolbar().items[2].tools.bold.$link[0]')
end
def ve_italics_element
- @browser.execute_script('return
ve.init.target.getToolbar().items[2].tools.italic.$link[0]')
+ visual_editor_element('return
ve.init.target.getToolbar().items[2].tools.italic.$link[0]')
end
def content_element
- @browser.execute_script('return
ve.init.target.surface.view.documentView.documentNode.$element[0]')
+ visual_editor_element('return
ve.init.target.surface.view.documentView.documentNode.$element[0]')
end
def tools_menu_element
--
To view, visit https://gerrit.wikimedia.org/r/270724
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9789ca42717133120197c4625bb8dad4ea496aa8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Zfilipin <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
