jenkins-bot has submitted this change and it was merged.
Change subject: [BrowserTest] Fix i18n files lookup
......................................................................
[BrowserTest] Fix i18n files lookup
The visual_editor_page used relative paths expecting the current
directory to be modules/ve-mw/tests/browser. Use absolute paths instead.
Change-Id: I8b1c4eddc2085ee80380f288bceb14c6feee0a60
---
M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb
M modules/ve-mw/tests/browser/features/support/visual_editor_helper.rb
2 files changed, 11 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
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 3c72a18..23a0ee7 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
@@ -6,7 +6,12 @@
def self.translate(string)
language = ENV['LANGUAGE_SCREENSHOT_CODE']
- file_name = (File.exist?("../../i18n/#{language}.json")) ?
"../../i18n/#{language}.json" : '../../i18n/en.json'
+
+ file_name = File.expand_path("../../../i18n/#{language}.json", __dir__)
+ unless File.exist?(file_name)
+ file_name = File.expand_path('../../../i18n/en.json', __dir__)
+ end
+
json = JSON.parse(File.read(file_name))
json[string] || ''
end
diff --git
a/modules/ve-mw/tests/browser/features/support/visual_editor_helper.rb
b/modules/ve-mw/tests/browser/features/support/visual_editor_helper.rb
index 115bac3..f0fdb2b 100644
--- a/modules/ve-mw/tests/browser/features/support/visual_editor_helper.rb
+++ b/modules/ve-mw/tests/browser/features/support/visual_editor_helper.rb
@@ -10,6 +10,10 @@
def i18n_file
language = lookup(:language_screenshot_code)
- (File.exist?("i18n/#{language}.json")) ? "i18n/#{language}.json" :
'i18n/en.json'
+ file_name = File.expand_path("../../i18n/#{language}.json", __dir__)
+ unless File.exist?(file_name)
+ file_name = File.expand_path('../../i18n/en.json', __dir__)
+ end
+ file_name
end
end
--
To view, visit https://gerrit.wikimedia.org/r/281414
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b1c4eddc2085ee80380f288bceb14c6feee0a60
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Zfilipin <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
