jenkins-bot has submitted this change and it was merged. Change subject: Renamed tests/acceptance folder to tests/browser ......................................................................
Renamed tests/acceptance folder to tests/browser To make it the same as almost all other repositories that have browser tests: https://github.com/wikimedia/mediawiki-selenium#links Change-Id: I4957a13e520163dc79ed9aec12d68a87a4fc52f2 --- M .gitignore M README.mediawiki M scripts/cucumber.sh R tests/browser/Gemfile R tests/browser/Gemfile.lock R tests/browser/config/config.yml R tests/browser/config/cucumber.yml R tests/browser/features/create_article.feature R tests/browser/features/footer.feature R tests/browser/features/footer_logged_in.feature R tests/browser/features/header.feature R tests/browser/features/header_logged_in.feature R tests/browser/features/language.feature R tests/browser/features/language_logged_in.feature R tests/browser/features/login_required_uploads.feature R tests/browser/features/login_required_watchlist.feature R tests/browser/features/menu_opens_page.feature R tests/browser/features/notification.feature R tests/browser/features/random_ua.feature R tests/browser/features/search.feature R tests/browser/features/step_definitions/create_article_steps.rb R tests/browser/features/step_definitions/footer_steps.rb R tests/browser/features/step_definitions/header_logged_in_steps.rb R tests/browser/features/step_definitions/header_steps.rb R tests/browser/features/step_definitions/language_steps.rb R tests/browser/features/step_definitions/login_required_uploads_steps.rb R tests/browser/features/step_definitions/login_required_watchlist_steps.rb R tests/browser/features/step_definitions/menu_opens_page_steps.rb R tests/browser/features/step_definitions/notification_steps.rb R tests/browser/features/step_definitions/random_ua_steps.rb R tests/browser/features/step_definitions/search_steps.rb R tests/browser/features/step_definitions/uploads_steps.rb R tests/browser/features/step_definitions/watchlist_steps.rb R tests/browser/features/support/env.rb R tests/browser/features/support/hooks.rb R tests/browser/features/support/modules/url_module.rb R tests/browser/features/support/pages/beta_page.rb R tests/browser/features/support/pages/create_article_page.rb R tests/browser/features/support/pages/create_user_page.rb R tests/browser/features/support/pages/edit_page.rb R tests/browser/features/support/pages/home_page.rb R tests/browser/features/support/pages/language_page.rb R tests/browser/features/support/pages/login_page.rb R tests/browser/features/support/pages/notification_page.rb R tests/browser/features/support/pages/random_page.rb R tests/browser/features/support/pages/search_page.rb R tests/browser/features/support/pages/uploads_page.rb R tests/browser/features/uploads.feature R tests/browser/features/watchlist.feature 49 files changed, 4 insertions(+), 6 deletions(-) Approvals: Mgrover: Looks good to me, approved jenkins-bot: Verified diff --git a/.gitignore b/.gitignore index bb0b66f..5ed45dd 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ .idea/ node_modules/ tmp/ -tests/acceptance/Gemfile.lock diff --git a/README.mediawiki b/README.mediawiki index 05a518c..aad00b7 100644 --- a/README.mediawiki +++ b/README.mediawiki @@ -60,13 +60,13 @@ ==== Selenium tests ==== To run the Selenium tests you will have to install Ruby (for the exact -version see tests/acceptance/.ruby-version), the latest versions of +version see tests/browser/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/acceptance. Update RubyGems and install required +Open terminal in tests/browser. Update RubyGems and install required gems with: gem update --system @@ -82,8 +82,7 @@ bundle exec cucumber -HTML report is created at tests/acceptance/reports and XML report (for -Jenkins) is created at tests/acceptance/reports/junit. +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/ diff --git a/scripts/cucumber.sh b/scripts/cucumber.sh index dd56a1d..3f68715 100755 --- a/scripts/cucumber.sh +++ b/scripts/cucumber.sh @@ -18,7 +18,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" echo "Checking required dependencies..." -cd "$DIR/../tests/acceptance" +cd "$DIR/../tests/browser" bundle install echo "Running Cucumber tests..." echo "Please ensure you have a user account for User:Selenium_user" diff --git a/tests/acceptance/Gemfile b/tests/browser/Gemfile similarity index 100% rename from tests/acceptance/Gemfile rename to tests/browser/Gemfile diff --git a/tests/acceptance/Gemfile.lock b/tests/browser/Gemfile.lock similarity index 100% rename from tests/acceptance/Gemfile.lock rename to tests/browser/Gemfile.lock diff --git a/tests/acceptance/config/config.yml b/tests/browser/config/config.yml similarity index 100% rename from tests/acceptance/config/config.yml rename to tests/browser/config/config.yml diff --git a/tests/acceptance/config/cucumber.yml b/tests/browser/config/cucumber.yml similarity index 100% rename from tests/acceptance/config/cucumber.yml rename to tests/browser/config/cucumber.yml diff --git a/tests/acceptance/features/create_article.feature b/tests/browser/features/create_article.feature similarity index 100% rename from tests/acceptance/features/create_article.feature rename to tests/browser/features/create_article.feature diff --git a/tests/acceptance/features/footer.feature b/tests/browser/features/footer.feature similarity index 100% rename from tests/acceptance/features/footer.feature rename to tests/browser/features/footer.feature diff --git a/tests/acceptance/features/footer_logged_in.feature b/tests/browser/features/footer_logged_in.feature similarity index 100% rename from tests/acceptance/features/footer_logged_in.feature rename to tests/browser/features/footer_logged_in.feature diff --git a/tests/acceptance/features/header.feature b/tests/browser/features/header.feature similarity index 100% rename from tests/acceptance/features/header.feature rename to tests/browser/features/header.feature diff --git a/tests/acceptance/features/header_logged_in.feature b/tests/browser/features/header_logged_in.feature similarity index 100% rename from tests/acceptance/features/header_logged_in.feature rename to tests/browser/features/header_logged_in.feature diff --git a/tests/acceptance/features/language.feature b/tests/browser/features/language.feature similarity index 100% rename from tests/acceptance/features/language.feature rename to tests/browser/features/language.feature diff --git a/tests/acceptance/features/language_logged_in.feature b/tests/browser/features/language_logged_in.feature similarity index 100% rename from tests/acceptance/features/language_logged_in.feature rename to tests/browser/features/language_logged_in.feature diff --git a/tests/acceptance/features/login_required_uploads.feature b/tests/browser/features/login_required_uploads.feature similarity index 100% rename from tests/acceptance/features/login_required_uploads.feature rename to tests/browser/features/login_required_uploads.feature diff --git a/tests/acceptance/features/login_required_watchlist.feature b/tests/browser/features/login_required_watchlist.feature similarity index 100% rename from tests/acceptance/features/login_required_watchlist.feature rename to tests/browser/features/login_required_watchlist.feature diff --git a/tests/acceptance/features/menu_opens_page.feature b/tests/browser/features/menu_opens_page.feature similarity index 100% rename from tests/acceptance/features/menu_opens_page.feature rename to tests/browser/features/menu_opens_page.feature diff --git a/tests/acceptance/features/notification.feature b/tests/browser/features/notification.feature similarity index 100% rename from tests/acceptance/features/notification.feature rename to tests/browser/features/notification.feature diff --git a/tests/acceptance/features/random_ua.feature b/tests/browser/features/random_ua.feature similarity index 100% rename from tests/acceptance/features/random_ua.feature rename to tests/browser/features/random_ua.feature diff --git a/tests/acceptance/features/search.feature b/tests/browser/features/search.feature similarity index 100% rename from tests/acceptance/features/search.feature rename to tests/browser/features/search.feature diff --git a/tests/acceptance/features/step_definitions/create_article_steps.rb b/tests/browser/features/step_definitions/create_article_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/create_article_steps.rb rename to tests/browser/features/step_definitions/create_article_steps.rb diff --git a/tests/acceptance/features/step_definitions/footer_steps.rb b/tests/browser/features/step_definitions/footer_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/footer_steps.rb rename to tests/browser/features/step_definitions/footer_steps.rb diff --git a/tests/acceptance/features/step_definitions/header_logged_in_steps.rb b/tests/browser/features/step_definitions/header_logged_in_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/header_logged_in_steps.rb rename to tests/browser/features/step_definitions/header_logged_in_steps.rb diff --git a/tests/acceptance/features/step_definitions/header_steps.rb b/tests/browser/features/step_definitions/header_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/header_steps.rb rename to tests/browser/features/step_definitions/header_steps.rb diff --git a/tests/acceptance/features/step_definitions/language_steps.rb b/tests/browser/features/step_definitions/language_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/language_steps.rb rename to tests/browser/features/step_definitions/language_steps.rb diff --git a/tests/acceptance/features/step_definitions/login_required_uploads_steps.rb b/tests/browser/features/step_definitions/login_required_uploads_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/login_required_uploads_steps.rb rename to tests/browser/features/step_definitions/login_required_uploads_steps.rb diff --git a/tests/acceptance/features/step_definitions/login_required_watchlist_steps.rb b/tests/browser/features/step_definitions/login_required_watchlist_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/login_required_watchlist_steps.rb rename to tests/browser/features/step_definitions/login_required_watchlist_steps.rb diff --git a/tests/acceptance/features/step_definitions/menu_opens_page_steps.rb b/tests/browser/features/step_definitions/menu_opens_page_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/menu_opens_page_steps.rb rename to tests/browser/features/step_definitions/menu_opens_page_steps.rb diff --git a/tests/acceptance/features/step_definitions/notification_steps.rb b/tests/browser/features/step_definitions/notification_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/notification_steps.rb rename to tests/browser/features/step_definitions/notification_steps.rb diff --git a/tests/acceptance/features/step_definitions/random_ua_steps.rb b/tests/browser/features/step_definitions/random_ua_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/random_ua_steps.rb rename to tests/browser/features/step_definitions/random_ua_steps.rb diff --git a/tests/acceptance/features/step_definitions/search_steps.rb b/tests/browser/features/step_definitions/search_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/search_steps.rb rename to tests/browser/features/step_definitions/search_steps.rb diff --git a/tests/acceptance/features/step_definitions/uploads_steps.rb b/tests/browser/features/step_definitions/uploads_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/uploads_steps.rb rename to tests/browser/features/step_definitions/uploads_steps.rb diff --git a/tests/acceptance/features/step_definitions/watchlist_steps.rb b/tests/browser/features/step_definitions/watchlist_steps.rb similarity index 100% rename from tests/acceptance/features/step_definitions/watchlist_steps.rb rename to tests/browser/features/step_definitions/watchlist_steps.rb diff --git a/tests/acceptance/features/support/env.rb b/tests/browser/features/support/env.rb similarity index 100% rename from tests/acceptance/features/support/env.rb rename to tests/browser/features/support/env.rb diff --git a/tests/acceptance/features/support/hooks.rb b/tests/browser/features/support/hooks.rb similarity index 100% rename from tests/acceptance/features/support/hooks.rb rename to tests/browser/features/support/hooks.rb diff --git a/tests/acceptance/features/support/modules/url_module.rb b/tests/browser/features/support/modules/url_module.rb similarity index 100% rename from tests/acceptance/features/support/modules/url_module.rb rename to tests/browser/features/support/modules/url_module.rb diff --git a/tests/acceptance/features/support/pages/beta_page.rb b/tests/browser/features/support/pages/beta_page.rb similarity index 100% rename from tests/acceptance/features/support/pages/beta_page.rb rename to tests/browser/features/support/pages/beta_page.rb diff --git a/tests/acceptance/features/support/pages/create_article_page.rb b/tests/browser/features/support/pages/create_article_page.rb similarity index 100% rename from tests/acceptance/features/support/pages/create_article_page.rb rename to tests/browser/features/support/pages/create_article_page.rb diff --git a/tests/acceptance/features/support/pages/create_user_page.rb b/tests/browser/features/support/pages/create_user_page.rb similarity index 100% rename from tests/acceptance/features/support/pages/create_user_page.rb rename to tests/browser/features/support/pages/create_user_page.rb diff --git a/tests/acceptance/features/support/pages/edit_page.rb b/tests/browser/features/support/pages/edit_page.rb similarity index 100% rename from tests/acceptance/features/support/pages/edit_page.rb rename to tests/browser/features/support/pages/edit_page.rb diff --git a/tests/acceptance/features/support/pages/home_page.rb b/tests/browser/features/support/pages/home_page.rb similarity index 100% rename from tests/acceptance/features/support/pages/home_page.rb rename to tests/browser/features/support/pages/home_page.rb diff --git a/tests/acceptance/features/support/pages/language_page.rb b/tests/browser/features/support/pages/language_page.rb similarity index 100% rename from tests/acceptance/features/support/pages/language_page.rb rename to tests/browser/features/support/pages/language_page.rb diff --git a/tests/acceptance/features/support/pages/login_page.rb b/tests/browser/features/support/pages/login_page.rb similarity index 100% rename from tests/acceptance/features/support/pages/login_page.rb rename to tests/browser/features/support/pages/login_page.rb diff --git a/tests/acceptance/features/support/pages/notification_page.rb b/tests/browser/features/support/pages/notification_page.rb similarity index 100% rename from tests/acceptance/features/support/pages/notification_page.rb rename to tests/browser/features/support/pages/notification_page.rb diff --git a/tests/acceptance/features/support/pages/random_page.rb b/tests/browser/features/support/pages/random_page.rb similarity index 100% rename from tests/acceptance/features/support/pages/random_page.rb rename to tests/browser/features/support/pages/random_page.rb diff --git a/tests/acceptance/features/support/pages/search_page.rb b/tests/browser/features/support/pages/search_page.rb similarity index 100% rename from tests/acceptance/features/support/pages/search_page.rb rename to tests/browser/features/support/pages/search_page.rb diff --git a/tests/acceptance/features/support/pages/uploads_page.rb b/tests/browser/features/support/pages/uploads_page.rb similarity index 100% rename from tests/acceptance/features/support/pages/uploads_page.rb rename to tests/browser/features/support/pages/uploads_page.rb diff --git a/tests/acceptance/features/uploads.feature b/tests/browser/features/uploads.feature similarity index 100% rename from tests/acceptance/features/uploads.feature rename to tests/browser/features/uploads.feature diff --git a/tests/acceptance/features/watchlist.feature b/tests/browser/features/watchlist.feature similarity index 100% rename from tests/acceptance/features/watchlist.feature rename to tests/browser/features/watchlist.feature -- To view, visit https://gerrit.wikimedia.org/r/87565 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4957a13e520163dc79ed9aec12d68a87a4fc52f2 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Zfilipin <[email protected]> Gerrit-Reviewer: Cmcmahon <[email protected]> Gerrit-Reviewer: Jdlrobson <[email protected]> Gerrit-Reviewer: Mgrover <[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
