jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/368457 )
Change subject: Having 2 folders for browser tests is confusing. ...................................................................... Having 2 folders for browser tests is confusing. This patch removes all unnecessary artifacts from the old Ruby tests. LocalSettings is needed for CI purposes and can be removed once CI has updated. Bug: T164024 Change-Id: Ifec8bf2b3cd7d4db105c254248cdfcdf773472ef --- D tests/browser/README.mediawiki D tests/browser/ci.yml D tests/browser/environments.yml 3 files changed, 0 insertions(+), 120 deletions(-) Approvals: jenkins-bot: Verified Jdlrobson: Looks good to me, approved diff --git a/tests/browser/README.mediawiki b/tests/browser/README.mediawiki deleted file mode 100644 index c797780..0000000 --- a/tests/browser/README.mediawiki +++ /dev/null @@ -1,56 +0,0 @@ -= Setup = - -Please include the LocalSettings.php file in your MediaWiki instance. - - -== Selenium tests == - -To run the Selenium tests you will have to install Ruby (for the exact -version see Gemfile), the latest versions of RubyGems and Firefox. - -The easiest way to install Ruby on *nix is RVM (https://rvm.io/) and on -Windows RubyInstaller (http://rubyinstaller.org/). - -Open terminal in tests/browser. Update RubyGems and install required -gems with: - - gem update --system - gem install bundler - bundle install - -Environment variables MEDIAWIKI_USER and MEDIAWIKI_PASSWORD are required for -tests tagged `@login`. For local testing, create a test user on your local wiki -and export the user and password as the values for those variables. -For example: - - export MEDIAWIKI_USER=<username here> # Linux/Unix/Mac - set MEDIAWIKI_USER=<username here> # Windows - - export MEDIAWIKI_PASSWORD=<password here> # Linux/Unix/Mac - set MEDIAWIKI_PASSWORD=<password here> # Windows - -In addition to this create another user which will be reserved for new uploads -"Selenium_newuser". The password for this user should be the same as -MEDIAWIKI_PASSWORD - -Tests that use the "Given I create a random page using the API" step need to set -the MEDIAWIKI_API_URL environment variable, e.g. -export MEDIAWIKI_API_URL=http://en.wikipedia.beta.wmflabs.org/w/api.php - -Run the tests from the RelatedArticles directory with: - - make cucumber - -If you want to run a single set of tests, go to the tests/browser directory and -call 'bundle exec cucumber' with the path to the test file. For example, to run -only the watchlist tests: - - bundle exec cucumber features/read_more_desktop.feature - -XML report (for Jenkins) is created at tests/browser/reports/junit. - -Jenkins is hosted at https://wmf.ci.cloudbees.com/ and it drives -browsers at http://saucelabs.com/ - -For more information about running Selenium tests please see -https://github.com/wikimedia/mediawiki-selenium diff --git a/tests/browser/ci.yml b/tests/browser/ci.yml deleted file mode 100644 index 59db8be..0000000 --- a/tests/browser/ci.yml +++ /dev/null @@ -1,9 +0,0 @@ -BROWSER: - - chrome - -MEDIAWIKI_ENVIRONMENT: - - beta-desktop - - beta-mobile - -PLATFORM: - - Linux diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml deleted file mode 100644 index dc42d7f..0000000 --- a/tests/browser/environments.yml +++ /dev/null @@ -1,55 +0,0 @@ -# Customize this configuration as necessary to provide defaults for various -# test environments. -# -# The set of defaults to use is determined by the MEDIAWIKI_ENVIRONMENT -# environment variable. -# -# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host -# bundle exec cucumber -# -# Additional variables set by the environment will override the corresponding -# defaults defined here. -# -# export MEDIAWIKI_ENVIRONMENT=mw-vagrant-host -# export MEDIAWIKI_USER=Selenium_user2 -# bundle exec cucumber -# -mw-vagrant-host: &default - mediawiki_url: http://127.0.0.1:8080/wiki/ - user_factory: true - -barry: - browser: phantomjs - user_factory: false - # mediawiki_url: Will be set manually - -mw-vagrant-guest: - mediawiki_url: http://127.0.0.1/wiki/ - user_factory: true - -beta-desktop: - mediawiki_url: https://en.wikipedia.beta.wmflabs.org/wiki/ - mediawiki_user: Selenium_user - # mediawiki_password: SET THIS IN THE ENVIRONMENT! - -beta-mobile: - mediawiki_url: https://en.m.wikipedia.beta.wmflabs.org/wiki/ - mediawiki_user: Selenium_user - # mediawiki_password: SET THIS IN THE ENVIRONMENT! - -staging: - mediawiki_url: http://reading-web-staging.wmflabs.org/wiki/ - mediawiki_user: Selenium_user - # mediawiki_password: SET THIS IN THE ENVIRONMENT! - -test2: - mediawiki_url: https://test2.wikipedia.org/wiki/ - mediawiki_user: Selenium_user - # mediawiki_password: SET THIS IN THE ENVIRONMENT! - -integration: - browser: chrome - user_factory: true - # mediawiki_url: JENKINS WILL SET THIS - -default: *default -- To view, visit https://gerrit.wikimedia.org/r/368457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifec8bf2b3cd7d4db105c254248cdfcdf773472ef Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/RelatedArticles Gerrit-Branch: master Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: Pmiazga <pmia...@wikimedia.org> Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
