Zfilipin has uploaded a new change for review. https://gerrit.wikimedia.org/r/306222
Change subject: WIP Upload language screenshot files using commons_upload Ruby gem ...................................................................... WIP Upload language screenshot files using commons_upload Ruby gem Bug: T143563 Change-Id: I7c0ca64aeea54501c51eb56a950143d5af251cf7 --- M Gemfile M Gemfile.lock M modules/ve-mw/tests/browser/features/support/env.rb D modules/ve-mw/tests/browser/features/support/hooks.rb D modules/ve-mw/tests/browser/features/support/visual_editor_helper.rb D modules/ve-mw/tests/browser/i18n/diq.json D modules/ve-mw/tests/browser/i18n/ur.json 7 files changed, 4 insertions(+), 53 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/22/306222/1 diff --git a/Gemfile b/Gemfile index 29f82f3..1bad15f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,6 @@ source 'https://rubygems.org' -gem 'commons_upload', '~> 0.0.4' +gem 'commons_upload', '~> 1.0' gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2' gem 'rake', '~> 10.4', '>= 10.4.2' gem 'rubocop', '~> 0.32.1', require: false -gem 'screenshot', '~> 0.0.7' diff --git a/Gemfile.lock b/Gemfile.lock index 7bfee12..bd82b3e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,9 +7,8 @@ builder (3.2.2) childprocess (0.5.9) ffi (~> 1.0, >= 1.0.11) - chunky_png (1.3.6) - commons_upload (0.0.4) - mediawiki_api (~> 0.4, >= 0.4.1) + commons_upload (1.0.0) + mediawiki_api (~> 0.7.0) cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -85,8 +84,6 @@ ruby-progressbar (~> 1.4) ruby-progressbar (1.8.1) rubyzip (1.2.0) - screenshot (0.0.7) - chunky_png (~> 1.3.3) selenium-webdriver (2.53.4) childprocess (~> 0.5) rubyzip (~> 1.0) @@ -105,11 +102,10 @@ ruby DEPENDENCIES - commons_upload (~> 0.0.4) + commons_upload (~> 1.0) mediawiki_selenium (~> 1.7, >= 1.7.2) rake (~> 10.4, >= 10.4.2) rubocop (~> 0.32.1) - screenshot (~> 0.0.7) BUNDLED WITH 1.12.5 diff --git a/modules/ve-mw/tests/browser/features/support/env.rb b/modules/ve-mw/tests/browser/features/support/env.rb index 3e48d00..5a104d1 100644 --- a/modules/ve-mw/tests/browser/features/support/env.rb +++ b/modules/ve-mw/tests/browser/features/support/env.rb @@ -2,8 +2,6 @@ require 'mediawiki_selenium/pages' require 'mediawiki_selenium/step_definitions' -require 'screenshot' - require_relative 'hooks' require_relative 'visual_editor_helper' diff --git a/modules/ve-mw/tests/browser/features/support/hooks.rb b/modules/ve-mw/tests/browser/features/support/hooks.rb deleted file mode 100644 index bc3b54d..0000000 --- a/modules/ve-mw/tests/browser/features/support/hooks.rb +++ /dev/null @@ -1,3 +0,0 @@ -Before('@language_screenshot') do |scenario| - @scenario = scenario -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 deleted file mode 100644 index f0fdb2b..0000000 --- a/modules/ve-mw/tests/browser/features/support/visual_editor_helper.rb +++ /dev/null @@ -1,19 +0,0 @@ -# -# Shared helper for VE browser test step definitions -# -module VisualEditorHelper - def translate(string) - file = File.read i18n_file - json = JSON.parse(file) - json["visualeditor-languagescreenshot-#{string.downcase.gsub(' ', '-')}-text"] || '' - end - - def i18n_file - language = lookup(:language_screenshot_code) - 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 diff --git a/modules/ve-mw/tests/browser/i18n/diq.json b/modules/ve-mw/tests/browser/i18n/diq.json deleted file mode 100644 index b7a380f..0000000 --- a/modules/ve-mw/tests/browser/i18n/diq.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Kumkumuk" - ] - }, - "visualeditor-languagescreenshot-hello-world-text": "Merhaba, Dınya", - "visualeditor-languagescreenshot-world-text": "Dınya", - "visualeditor-languagescreenshot-category-earth-text": "Kategori:Erd" -} diff --git a/modules/ve-mw/tests/browser/i18n/ur.json b/modules/ve-mw/tests/browser/i18n/ur.json deleted file mode 100644 index fadd6ac..0000000 --- a/modules/ve-mw/tests/browser/i18n/ur.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "@metadata": { - "authors": [ - "Muhammad Shuaib" - ] - }, - "visualeditor-languagescreenshot-hello-world-text": "اہل دنیا کو خوش آمدید!", - "visualeditor-languagescreenshot-world-text": "دنیا", - "visualeditor-languagescreenshot-category-earth-text": "زمرہ:زمین" -} -- To view, visit https://gerrit.wikimedia.org/r/306222 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c0ca64aeea54501c51eb56a950143d5af251cf7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Zfilipin <zfili...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
