Cmcmahon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/79071
Change subject: Login by default so no need for conditionals that cause bogus
failures
......................................................................
Login by default so no need for conditionals that cause bogus failures
Change-Id: Icb6b706e77d71802f98e205cee56b8656c58d0ca
---
M tests/browser/config/config.yml
M tests/browser/features/full_text.feature
M tests/browser/features/step_definitions/page_steps.rb
3 files changed, 6 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/71/79071/1
diff --git a/tests/browser/config/config.yml b/tests/browser/config/config.yml
index f0fb67a..d3dd9f3 100644
--- a/tests/browser/config/config.yml
+++ b/tests/browser/config/config.yml
@@ -1,7 +1,5 @@
-# mediawiki_username: Selenium_user
-# mediawiki_password: selenium123
-mediawiki_username: NEverett (WMF)
-mediawiki_password: 'H/a=O>_10lYz'
+mediawiki_username: Selenium_user
+mediawiki_password: this_is_bogus
android:
name: android
diff --git a/tests/browser/features/full_text.feature
b/tests/browser/features/full_text.feature
index 8776062..1af362a 100644
--- a/tests/browser/features/full_text.feature
+++ b/tests/browser/features/full_text.feature
@@ -1,4 +1,8 @@
Feature: Full text search
+
+ Background:
+ Given I am logged in
+
@setup_main
Scenario Outline: Query string search
Given I am at a random page
diff --git a/tests/browser/features/step_definitions/page_steps.rb
b/tests/browser/features/step_definitions/page_steps.rb
index 770cfa4..3c9cd37 100644
--- a/tests/browser/features/step_definitions/page_steps.rb
+++ b/tests/browser/features/step_definitions/page_steps.rb
@@ -13,20 +13,6 @@
def edit_page(title, text, add)
visit(EditPage, using_params: {page_name: title}) do |page|
- if (!page.article_text? and page.login?) then
- # Looks like we're not being given the article text probably because
we're
- # trying to edit an article that requires us to be logged in. Lets try
- # logging in.
- step 'I am logged in'
- visit(EditPage, using_params: {page_name: title})
- end
- if (page.article_text.strip != text.strip) then
- if (!page.save? and page.login?) then
- # Looks like I'm at a page I don't have permission to change and I'm
not
- # logged in. Lets log in and try again.
- step 'I am logged in'
- visit(EditPage, using_params: {page_name: title})
- end
if (add) then
page.article_text += text
else
@@ -34,5 +20,4 @@
end
page.save
end
- end
end
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/79071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb6b706e77d71802f98e205cee56b8656c58d0ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Cmcmahon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
