jenkins-bot has submitted this change and it was merged.
Change subject: MobileFrontend and UploadWizard share upload steps.
......................................................................
MobileFrontend and UploadWizard share upload steps.
Change-Id: Ic2c076869a15adb51294bd33a6529998d74cd616
---
M tests/browser/Gemfile.lock
M tests/browser/features/step_definitions/uploads_steps.rb
2 files changed, 1 insertion(+), 29 deletions(-)
Approvals:
Cmcmahon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock
index 83e4be0..bd3747b 100644
--- a/tests/browser/Gemfile.lock
+++ b/tests/browser/Gemfile.lock
@@ -23,7 +23,7 @@
headless (1.0.1)
i18n (0.6.9)
json (1.8.1)
- mediawiki_selenium (0.2.15)
+ mediawiki_selenium (0.2.16)
cucumber (~> 1.3, >= 1.3.10)
headless (~> 1.0, >= 1.0.1)
json (~> 1.8, >= 1.8.1)
diff --git a/tests/browser/features/step_definitions/uploads_steps.rb
b/tests/browser/features/step_definitions/uploads_steps.rb
index 67f682f..aa6e162 100644
--- a/tests/browser/features/step_definitions/uploads_steps.rb
+++ b/tests/browser/features/step_definitions/uploads_steps.rb
@@ -15,34 +15,6 @@
on(UploadPage).photo_description_element.when_present.send_keys("Describing
with #{@random_string}")
end
-When(/^upload bogus file (.+)$/) do |file_name|
- require "tempfile"
- path = "#{Dir.tmpdir}/#{file_name}"
-
- system("touch #{path}")
- if @browser.driver.browser == :chrome
- @browser.execute_script
"document.getElementsByName('file')[0].removeAttribute('class');"
- @browser.execute_script
"document.getElementsByName('file')[0].removeAttribute('style');"
- end
-
- on(UploadPage).select_file = path
-end
-
-When(/^upload file (.+)$/) do |file_name|
- require "tempfile"
- path = "#{Dir.tmpdir}/#{file_name}"
-
- require "chunky_png"
- ChunkyPNG::Image.new(Random.new.rand(255), Random.new.rand(255),
Random.new.rand(255)).save path
-
- if @browser.driver.browser == :chrome
- @browser.execute_script
"document.getElementsByName('file')[0].removeAttribute('class');"
- @browser.execute_script
"document.getElementsByName('file')[0].removeAttribute('style');"
- end
-
- on(UploadPage).select_file = path
-end
-
Then(/^my image is on the Uploads page$/) do
on(UploadPage) do |page|
page.wait_until(10) do
--
To view, visit https://gerrit.wikimedia.org/r/120001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic2c076869a15adb51294bd33a6529998d74cd616
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Cmcmahon <[email protected]>
Gerrit-Reviewer: JGonera <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: MaxSem <[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
