Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/271756
Change subject: Cleanup Cucumber tags in Selenium tests
......................................................................
Cleanup Cucumber tags in Selenium tests
Add @vagrant tag (instead of @clean) for features and scenarios that
run fine when targeting mediawiki-vagrant, remove unused tags.
Also removed license headers from a few files, we are no longer using
them.
Bug: T127423
Change-Id: I0fa9f126b9448c86f8e7eced13611cac6c38277c
---
M tests/browser/features/bad_syntax_api.feature
M tests/browser/features/boolean_operators_api.feature
M tests/browser/features/boost_template_api.feature
M tests/browser/features/combined_filters_api.feature
M tests/browser/features/commons.feature
M tests/browser/features/commonterms_api.feature
M tests/browser/features/create_new_page.feature
M tests/browser/features/did_you_mean_api.feature
M tests/browser/features/dump_action.feature
M tests/browser/features/dump_config.feature
M tests/browser/features/dump_mapping.feature
M tests/browser/features/dump_query.feature
M tests/browser/features/dump_settings.feature
M tests/browser/features/elasticsearch_on_special_version.feature
M tests/browser/features/exact_quotes_api.feature
M tests/browser/features/full_text_advanced.feature
M tests/browser/features/full_text_api.feature
M tests/browser/features/full_text_browser.feature
M tests/browser/features/fuzzy_api.feature
M tests/browser/features/go_api.feature
M tests/browser/features/go_browser.feature
M tests/browser/features/hastemplate_api.feature
M tests/browser/features/highlighting_api.feature
M tests/browser/features/incategory_api.feature
M tests/browser/features/insource_api.feature
M tests/browser/features/intitle_api.feature
M tests/browser/features/linksto_api.feature
M tests/browser/features/more_like_api.feature
M tests/browser/features/more_like_this_options.feature
M tests/browser/features/phrase_prefix_api.feature
M tests/browser/features/prefer_recent_api.feature
M tests/browser/features/prefix_api.feature
M tests/browser/features/prefix_browser.feature
M tests/browser/features/prefix_search_api.feature
M tests/browser/features/relevancy_api.feature
M tests/browser/features/removed_text_api.feature
M tests/browser/features/smoke.feature
M tests/browser/features/step_definitions/simple_search_steps.rb
M tests/browser/features/suggest_api.feature
M tests/browser/features/support/hooks.rb
M tests/browser/features/update_general_api.feature
M tests/browser/features/update_non_existent_api.feature
M tests/browser/features/update_redirect_api.feature
M tests/browser/features/update_redirect_loop.feature
M tests/browser/features/update_weight_api.feature
M tests/browser/features/wildcard_api.feature
46 files changed, 47 insertions(+), 80 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/56/271756/1
diff --git a/tests/browser/features/bad_syntax_api.feature
b/tests/browser/features/bad_syntax_api.feature
index 53e1011..f593fd1 100644
--- a/tests/browser/features/bad_syntax_api.feature
+++ b/tests/browser/features/bad_syntax_api.feature
@@ -1,4 +1,4 @@
-@bad_syntax @clean @api
+@api @bad_syntax @vagrant
Feature: Searches with syntax errors
@setup_main
Scenario: Searching for <text>~<text> treats the tilde like a space except
that the whole "word" (including tilde) makes a phrase search
diff --git a/tests/browser/features/boolean_operators_api.feature
b/tests/browser/features/boolean_operators_api.feature
index 230268e..d06a0b3 100644
--- a/tests/browser/features/boolean_operators_api.feature
+++ b/tests/browser/features/boolean_operators_api.feature
@@ -1,4 +1,4 @@
-@boolean_operators @clean @api @setup_main
+@api @boolean_operators @setup_main @vagrant
Feature: Searches with boolean operators
Scenario Outline: -, !, and NOT prohibit words in search results
When I api search for <query>
diff --git a/tests/browser/features/boost_template_api.feature
b/tests/browser/features/boost_template_api.feature
index 3e91dd1..bef1e9a 100644
--- a/tests/browser/features/boost_template_api.feature
+++ b/tests/browser/features/boost_template_api.feature
@@ -1,4 +1,4 @@
-@boost_template @clean @api
+@api @boost_template @vagrant
Feature: Searches with the boost-template operator
Scenario: Searching for a page without template boosts doesn't use them
When I api search for BoostTemplateTest
diff --git a/tests/browser/features/combined_filters_api.feature
b/tests/browser/features/combined_filters_api.feature
index 665dd58..e8e8fc6 100644
--- a/tests/browser/features/combined_filters_api.feature
+++ b/tests/browser/features/combined_filters_api.feature
@@ -1,4 +1,4 @@
-@clean @filters @api
+@api @filters @vagrant
Feature: Searches with combined filters
Scenario Outline: Filters can be combined
When I api search for <term>
diff --git a/tests/browser/features/commons.feature
b/tests/browser/features/commons.feature
index 675b196..bde8a98 100644
--- a/tests/browser/features/commons.feature
+++ b/tests/browser/features/commons.feature
@@ -1,4 +1,4 @@
-@clean @api @commons
+@api @commons @vagrant
Feature: Searching for files on local wiki stored on commons
Scenario: A file that exists only on commons can be found on the local wiki
When I api search in namespace 6 for oncommons
diff --git a/tests/browser/features/commonterms_api.feature
b/tests/browser/features/commonterms_api.feature
index 16f548e..567f1cf 100644
--- a/tests/browser/features/commonterms_api.feature
+++ b/tests/browser/features/commonterms_api.feature
@@ -1,4 +1,4 @@
-@clean @api @relevancy
+@api @relevancy @vagrant
Feature: Common Terms Query
Scenario: The default query string builder is strict
When I api search for this is not a relevant Relevancytest
diff --git a/tests/browser/features/create_new_page.feature
b/tests/browser/features/create_new_page.feature
index 5057802..f5a20ca 100644
--- a/tests/browser/features/create_new_page.feature
+++ b/tests/browser/features/create_new_page.feature
@@ -1,4 +1,4 @@
-@clean @phantomjs @bad_syntax
+@bad_syntax @phantomjs @vagrant
Feature: Searches that prompt, or not, for new page creation
Background:
Given I am at a random page
diff --git a/tests/browser/features/did_you_mean_api.feature
b/tests/browser/features/did_you_mean_api.feature
index 90545ed..11b31de 100644
--- a/tests/browser/features/did_you_mean_api.feature
+++ b/tests/browser/features/did_you_mean_api.feature
@@ -1,4 +1,4 @@
-@clean @api @suggestions
+@api @suggestions @vagrant
Feature: Did you mean
Scenario: Uncommon phrases spelled correctly don't get suggestions even if
one of the words is very uncommon
When I api search for nobel prize
diff --git a/tests/browser/features/dump_action.feature
b/tests/browser/features/dump_action.feature
index 42085b4..681bfa9 100644
--- a/tests/browser/features/dump_action.feature
+++ b/tests/browser/features/dump_action.feature
@@ -1,4 +1,4 @@
-@clean @dump_action @phantomjs
+@dump_action @phantomjs @vagrant
Feature: Cirrus dump
Scenario: Can dump pages
When I dump the cirrus data for Main Page
diff --git a/tests/browser/features/dump_config.feature
b/tests/browser/features/dump_config.feature
index 5336f15..727985c 100644
--- a/tests/browser/features/dump_config.feature
+++ b/tests/browser/features/dump_config.feature
@@ -1,4 +1,4 @@
-@clean @dump_config @phantomjs
+@dump_config @phantomjs @vagrant
Feature: You can dump CirrusSearch's configuration
Scenario: You can dump CirrusSearch's configuration
When I dump the cirrus config
diff --git a/tests/browser/features/dump_mapping.feature
b/tests/browser/features/dump_mapping.feature
index 5685577..1f53320 100644
--- a/tests/browser/features/dump_mapping.feature
+++ b/tests/browser/features/dump_mapping.feature
@@ -1,4 +1,4 @@
-@clean @dump_mapping @phantomjs
+@dump_mapping @phantomjs @vagrant
Feature: You can dump the mapping CirrusSearch set on Elasticsearch's indexes
Scenario: You can dump the mapping CirrusSearch set on Elasticsearch's
indexes
When I dump the cirrus mapping
diff --git a/tests/browser/features/dump_query.feature
b/tests/browser/features/dump_query.feature
index 5fe7eaa..70fbc78 100644
--- a/tests/browser/features/dump_query.feature
+++ b/tests/browser/features/dump_query.feature
@@ -1,4 +1,4 @@
-@clean @dump_quer @phantomjs
+@dump_quer @phantomjs @vagrant
Feature: Can dump the query syntax
Scenario: Can dump the query syntax
Given I am at a random page
diff --git a/tests/browser/features/dump_settings.feature
b/tests/browser/features/dump_settings.feature
index a819a93..1b37a15 100644
--- a/tests/browser/features/dump_settings.feature
+++ b/tests/browser/features/dump_settings.feature
@@ -1,4 +1,4 @@
-@clean @dump_settings @phantomjs
+@dump_settings @phantomjs @vagrant
Feature: You can dump the settings CirrusSearch set on Elasticsearch's indexes
Scenario: You can dump the settings CirrusSearch set on Elasticsearch's
indexes
When I dump the cirrus settings
diff --git a/tests/browser/features/elasticsearch_on_special_version.feature
b/tests/browser/features/elasticsearch_on_special_version.feature
index 8dadd92..5c9adf6 100644
--- a/tests/browser/features/elasticsearch_on_special_version.feature
+++ b/tests/browser/features/elasticsearch_on_special_version.feature
@@ -1,4 +1,4 @@
-@clean @phantomjs
+@phantomjs @vagrant
Feature: Elasticsearch version in Special:Version
Scenario: Elasticsearch version is in Special:Version
When I go to Special:Version
diff --git a/tests/browser/features/exact_quotes_api.feature
b/tests/browser/features/exact_quotes_api.feature
index 5d071cf..fda42fe 100644
--- a/tests/browser/features/exact_quotes_api.feature
+++ b/tests/browser/features/exact_quotes_api.feature
@@ -1,4 +1,4 @@
-@clean @exact_quotes @api
+@api @exact_quotes @vagrant
Feature: Searches that contain quotes
Scenario: Searching for a word in quotes disbles stemming (can still find
plural with exact match)
When I api search for "pickles"
diff --git a/tests/browser/features/full_text_advanced.feature
b/tests/browser/features/full_text_advanced.feature
index 5c2819a..ca4ae63 100644
--- a/tests/browser/features/full_text_advanced.feature
+++ b/tests/browser/features/full_text_advanced.feature
@@ -1,4 +1,4 @@
-@clean @phantomjs @setup_main @setup_namespaces
+@phantomjs @setup_main @setup_namespaces @vagrant
Feature: Full text search advanced features
Background:
Given I am at the search results page
diff --git a/tests/browser/features/full_text_api.feature
b/tests/browser/features/full_text_api.feature
index 2139926..95da831 100644
--- a/tests/browser/features/full_text_api.feature
+++ b/tests/browser/features/full_text_api.feature
@@ -1,4 +1,4 @@
-@clean @api
+@api @vagrant
Feature: Full text search
@headings
Scenario: Pages can be found by their headings
diff --git a/tests/browser/features/full_text_browser.feature
b/tests/browser/features/full_text_browser.feature
index 8d4ec12..62bc9be 100644
--- a/tests/browser/features/full_text_browser.feature
+++ b/tests/browser/features/full_text_browser.feature
@@ -1,4 +1,4 @@
-@clean @phantomjs
+@phantomjs @vagrant
Feature: Full text search
Background:
Given I am at a random page
diff --git a/tests/browser/features/fuzzy_api.feature
b/tests/browser/features/fuzzy_api.feature
index e488899..20ab779 100644
--- a/tests/browser/features/fuzzy_api.feature
+++ b/tests/browser/features/fuzzy_api.feature
@@ -1,4 +1,4 @@
-@clean @api @setup_main
+@api @setup_main @vagrant
Feature: Searches that contain fuzzy matches
Scenario: Searching for <text>~0 activates fuzzy search but with 0 fuzziness
(finding a result if the term is corret)
When I api search for ffnonesenseword~0
diff --git a/tests/browser/features/go_api.feature
b/tests/browser/features/go_api.feature
index 51f3ffb..4e03e74 100644
--- a/tests/browser/features/go_api.feature
+++ b/tests/browser/features/go_api.feature
@@ -1,4 +1,4 @@
-@clean @go @api
+@api @go @vagrant
Feature: Go Search
Scenario: I can "go" to a page with mixed capital and lower case name by the
name all lower cased
When I get api near matches for mixedcapsandlowercase
diff --git a/tests/browser/features/go_browser.feature
b/tests/browser/features/go_browser.feature
index b92d70f..1b46ec0 100644
--- a/tests/browser/features/go_browser.feature
+++ b/tests/browser/features/go_browser.feature
@@ -1,4 +1,4 @@
-@clean @go @phantomjs
+@go @phantomjs @vagrant
Feature: Go Search
@from_core
Scenario: I can "go" to a user's page whether it is there or not
diff --git a/tests/browser/features/hastemplate_api.feature
b/tests/browser/features/hastemplate_api.feature
index 66c9608..8b5a5d2 100644
--- a/tests/browser/features/hastemplate_api.feature
+++ b/tests/browser/features/hastemplate_api.feature
@@ -1,4 +1,4 @@
-@clean @filters @hastemplate @api
+@api @filters @hastemplate @vagrant
Feature: Searches with the hastemplate filter
Scenario: hastemplate: finds pages with matching templates with namespace
specified
When I api search for hastemplate:"Template:Template Test"
diff --git a/tests/browser/features/highlighting_api.feature
b/tests/browser/features/highlighting_api.feature
index 87b07ee..9bf5c34 100644
--- a/tests/browser/features/highlighting_api.feature
+++ b/tests/browser/features/highlighting_api.feature
@@ -1,4 +1,4 @@
-@clean @highlighting @api
+@api @highlighting @vagrant
Feature: Highlighting
@setup_main
Scenario Outline: Found words are highlighted
diff --git a/tests/browser/features/incategory_api.feature
b/tests/browser/features/incategory_api.feature
index ef6889b..68cf781 100644
--- a/tests/browser/features/incategory_api.feature
+++ b/tests/browser/features/incategory_api.feature
@@ -1,4 +1,4 @@
-@clean @filters @incategory @api
+@api @filters @incategory @vagrant
Feature: Searches with the incategory filter
Scenario: incategory: only includes pages with the category
diff --git a/tests/browser/features/insource_api.feature
b/tests/browser/features/insource_api.feature
index 6f7cbca..bb6b86a 100644
--- a/tests/browser/features/insource_api.feature
+++ b/tests/browser/features/insource_api.feature
@@ -1,4 +1,4 @@
-@clean @filters @insource @api
+@api @filters @insource @vagrant
Feature: Searches with the insource filter
Scenario: insource: only includes pages with the source
When I api search for all:insource:pickles
diff --git a/tests/browser/features/intitle_api.feature
b/tests/browser/features/intitle_api.feature
index 91fa524..23abedf 100644
--- a/tests/browser/features/intitle_api.feature
+++ b/tests/browser/features/intitle_api.feature
@@ -1,4 +1,4 @@
-@clean @filters @intitle @api
+@api @filters @intitle @vagrant
Feature: Searches with the intitle filter
Scenario: intitle: can be combined with other text
When I api search for intitle:catapult amazing
diff --git a/tests/browser/features/linksto_api.feature
b/tests/browser/features/linksto_api.feature
index e527e6c..3594cc5 100644
--- a/tests/browser/features/linksto_api.feature
+++ b/tests/browser/features/linksto_api.feature
@@ -1,4 +1,4 @@
-@clean @filters @linksto @api
+@api @filters @linksto @vagrant
Feature: Searches with the linksto filter
Scenario: linksto only includes pages with the links
When I api search for linksto:"LinksToTest Target"
diff --git a/tests/browser/features/more_like_api.feature
b/tests/browser/features/more_like_api.feature
index c04a321..34838d1 100644
--- a/tests/browser/features/more_like_api.feature
+++ b/tests/browser/features/more_like_api.feature
@@ -1,4 +1,4 @@
-@clean @more_like_this @api
+@api @more_like_this @vagrant
Feature: More like an article
Scenario: Searching for morelike:<page that doesn't exist> returns no results
When I api search for morelike:IDontExist
diff --git a/tests/browser/features/more_like_this_options.feature
b/tests/browser/features/more_like_this_options.feature
index fc1f618..4c4aeac 100644
--- a/tests/browser/features/more_like_this_options.feature
+++ b/tests/browser/features/more_like_this_options.feature
@@ -1,4 +1,4 @@
-@clean @phantomjs @setup_main
+@phantomjs @setup_main @vagrant
Feature: More like this queries with custom settings
Background:
Given I am at a random page
diff --git a/tests/browser/features/phrase_prefix_api.feature
b/tests/browser/features/phrase_prefix_api.feature
index 9b58b2c..2f38d1e 100644
--- a/tests/browser/features/phrase_prefix_api.feature
+++ b/tests/browser/features/phrase_prefix_api.feature
@@ -1,4 +1,4 @@
-@clean @api @phrase_prefix
+@api @phrase_prefix @vagrant
Feature: Searches with a phrase prefix term
Scenario: Simple quoted prefix phrases get results
When I api search for functional p*
diff --git a/tests/browser/features/prefer_recent_api.feature
b/tests/browser/features/prefer_recent_api.feature
index 8885558..20df983 100644
--- a/tests/browser/features/prefer_recent_api.feature
+++ b/tests/browser/features/prefer_recent_api.feature
@@ -1,4 +1,4 @@
-@clean @api @prefer_recent
+@api @prefer_recent @vagrant
Feature: Searches with prefer-recent
@expect_failure
Scenario Outline: Recently updated articles are prefered if prefer-recent:
is specified
diff --git a/tests/browser/features/prefix_api.feature
b/tests/browser/features/prefix_api.feature
index e7a38f9..1ade60c 100644
--- a/tests/browser/features/prefix_api.feature
+++ b/tests/browser/features/prefix_api.feature
@@ -1,4 +1,4 @@
-@clean @api @prefix_filter
+@api @prefix_filter @vagrant
Feature: Searches with a prefix filter
Scenario: The prefix: filter interprets spaces literally
When I api search for prefix prefix:prefix tes
diff --git a/tests/browser/features/prefix_browser.feature
b/tests/browser/features/prefix_browser.feature
index 235a1d8..13726d7 100644
--- a/tests/browser/features/prefix_browser.feature
+++ b/tests/browser/features/prefix_browser.feature
@@ -1,4 +1,4 @@
-@clean @phantomjs @prefix_filter
+@phantomjs @prefix_filter @vagrant
Feature: Searches with a prefix filter
Background:
Given I am at a random page
diff --git a/tests/browser/features/prefix_search_api.feature
b/tests/browser/features/prefix_search_api.feature
index 22fcf82..d4e79be 100644
--- a/tests/browser/features/prefix_search_api.feature
+++ b/tests/browser/features/prefix_search_api.feature
@@ -1,4 +1,4 @@
-@clean @api @prefix
+@api @prefix @vagrant
Feature: Prefix search via api
Scenario: Suggestions don't appear when you search for a string that is too
long
When I get api suggestions for
贵州省瞬时速度团头鲂身体c实施ysstsstsg说tyttxy以推销员会同香港推广系统在同他讨厌她团体淘汰>赛系统大选于它拥有一天天用于与体育学院国ttxzyttxtxytdttyyyztdsytstsstxtttd天天体育系统的摄像头听到他他偷笑>偷笑太阳团体杏眼桃腮他要tttxx
y贵州省瞬时速度团头鲂身体c实施ysstsstsg说tyttxy以推销员会同香港推广系统在同他讨厌她团体淘汰>赛系统大选于它拥有一天天用于与体育学院国ttxzyttxtxytdttyyyztdsytstsstxtttd天天体育系统的摄像头听到他他偷笑>偷笑太阳团体杏眼桃腮他要tttxx
y
diff --git a/tests/browser/features/relevancy_api.feature
b/tests/browser/features/relevancy_api.feature
index 4830e13..4a848bd 100644
--- a/tests/browser/features/relevancy_api.feature
+++ b/tests/browser/features/relevancy_api.feature
@@ -1,4 +1,4 @@
-@clean @api @relevancy
+@api @relevancy @vagrant
Feature: Results are ordered from most relevant to least.
Scenario: Words in order are worth more then words out of order
When I api search for Relevancytwo Wordtest
diff --git a/tests/browser/features/removed_text_api.feature
b/tests/browser/features/removed_text_api.feature
index 216bbb5..8fb74f1 100644
--- a/tests/browser/features/removed_text_api.feature
+++ b/tests/browser/features/removed_text_api.feature
@@ -1,4 +1,4 @@
-@clean @api @setup_main @removed_text
+@api @removed_text @setup_main @vagrant
Feature: Removed text
Scenario: Searching fox text that is inside <video> and <audio> tags doesn't
find it
When I api search for "JavaScript disabled"
diff --git a/tests/browser/features/smoke.feature
b/tests/browser/features/smoke.feature
index 1f5558e..60fa346 100644
--- a/tests/browser/features/smoke.feature
+++ b/tests/browser/features/smoke.feature
@@ -1,15 +1,4 @@
-#
-# This file is subject to the license terms in the COPYING file found in the
-# CirrusSearch top-level directory and at
-#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/COPYING.
No part of
-# CirrusSearch, including this file, may be copied, modified, propagated, or
-# distributed except according to the terms contained in the COPYING file.
-#
-# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
-# CirrusSearch top-level directory and at
-#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/CREDITS
-#
-@clean @firefox @test2.wikipedia.org @phantomjs @smoke
+@firefox @phantomjs @smoke @vagrant
Feature: Smoke test
@en.wikipedia.beta.wmflabs.org
diff --git a/tests/browser/features/step_definitions/simple_search_steps.rb
b/tests/browser/features/step_definitions/simple_search_steps.rb
index ca2698a..1c581ce 100644
--- a/tests/browser/features/step_definitions/simple_search_steps.rb
+++ b/tests/browser/features/step_definitions/simple_search_steps.rb
@@ -1,14 +1,3 @@
-#
-# This file is subject to the license terms in the COPYING file found in the
-# CirrusSearch top-level directory and at
-#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/COPYING.
No part of
-# CirrusSearch, including this file, may be copied, modified, propagated, or
-# distributed except according to the terms contained in the COPYING file.
-#
-# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
-# CirrusSearch top-level directory and at
-#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/CREDITS
-#
When(/^I search for: (.+)$/) do |search_term|
on(SearchPage).search_input_element.when_present.send_keys(search_term)
end
diff --git a/tests/browser/features/suggest_api.feature
b/tests/browser/features/suggest_api.feature
index 52e74ef..c9f9d04 100644
--- a/tests/browser/features/suggest_api.feature
+++ b/tests/browser/features/suggest_api.feature
@@ -1,15 +1,4 @@
-#
-# This file is subject to the license terms in the COPYING file found in the
-# CirrusSearch top-level directory and at
-#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/COPYING.
No part of
-# CirrusSearch, including this file, may be copied, modified, propagated, or
-# distributed except according to the terms contained in the COPYING file.
-#
-# Copyright 2012-2014 by the Mediawiki developers. See the CREDITS file in the
-# CirrusSearch top-level directory and at
-#
https://git.wikimedia.org/blob/mediawiki%2Fextensions%2FCirrusSearch/HEAD/CREDITS
-#
-@api @suggest
+@api @suggest @vagrant
Feature: Suggestion API test
Scenario: Search suggestions
diff --git a/tests/browser/features/support/hooks.rb
b/tests/browser/features/support/hooks.rb
index 2610906..59053b6 100644
--- a/tests/browser/features/support/hooks.rb
+++ b/tests/browser/features/support/hooks.rb
@@ -29,13 +29,13 @@
end
end
-clean = false
-Before("@clean") do
+vagrant = false
+Before("@vagrant") do
unless clean
steps %(
Given I delete DeleteMeRedirect
)
- clean = true
+ vagrant = true
end
end
diff --git a/tests/browser/features/update_general_api.feature
b/tests/browser/features/update_general_api.feature
index 0735f59..f780fbb 100644
--- a/tests/browser/features/update_general_api.feature
+++ b/tests/browser/features/update_general_api.feature
@@ -1,4 +1,4 @@
-@clean @api @update
+@api @update @vagrant
Feature: Search backend updates
Scenario: Deleted pages are removed from the index
Given a page named DeleteMe exists
diff --git a/tests/browser/features/update_non_existent_api.feature
b/tests/browser/features/update_non_existent_api.feature
index 08b3acc..46c3311 100644
--- a/tests/browser/features/update_non_existent_api.feature
+++ b/tests/browser/features/update_non_existent_api.feature
@@ -1,4 +1,4 @@
-@clean @non_existent @api @update
+@api @non_existent @update @vagrant
Feature: Search backend updates that reference nonexistent pages
Scenario: Pages that link to nonexistent pages still get their search index
updated
Given a page named IDontExist doesn't exist
diff --git a/tests/browser/features/update_redirect_api.feature
b/tests/browser/features/update_redirect_api.feature
index 1e55b79..b319d33 100644
--- a/tests/browser/features/update_redirect_api.feature
+++ b/tests/browser/features/update_redirect_api.feature
@@ -1,4 +1,4 @@
-@clean @api @redirect @update
+@api @redirect @update @vagrant
Feature: Updating a page from or to a redirect
@expect_failure
Scenario: Turning a page into a redirect removes it from the search index
diff --git a/tests/browser/features/update_redirect_loop.feature
b/tests/browser/features/update_redirect_loop.feature
index 3ed6a5c..15323f5 100644
--- a/tests/browser/features/update_redirect_loop.feature
+++ b/tests/browser/features/update_redirect_loop.feature
@@ -1,4 +1,4 @@
-@clean @phantomjs @update @redirect_loop
+@phantomjs @redirect_loop @update @vagrant
Feature: Search backend updates containing redirect loops
Scenario: Pages that redirect to themself don't throw errors
Then a page named IAmABad RedirectSelf%{epoch} exists with contents
#REDIRECT [[IAmABad RedirectSelf%{epoch}]]
diff --git a/tests/browser/features/update_weight_api.feature
b/tests/browser/features/update_weight_api.feature
index a5b5fbd..8da8bed 100644
--- a/tests/browser/features/update_weight_api.feature
+++ b/tests/browser/features/update_weight_api.feature
@@ -1,4 +1,4 @@
-@clean @api @update @weight
+@api @update @vagrant @weight
Feature: Page updates trigger appropriate weight updates in newly linked and
unlinked articles
# Note that these tests can be a bit flakey if you don't use Redis and
checkDelay because they count using
# Elasticsearch which delays all updates for around a second. So if the
jobs run too fast they won't work.
diff --git a/tests/browser/features/wildcard_api.feature
b/tests/browser/features/wildcard_api.feature
index 4ea2e09..cc193ec 100644
--- a/tests/browser/features/wildcard_api.feature
+++ b/tests/browser/features/wildcard_api.feature
@@ -1,4 +1,4 @@
-@clean @api @wildcard
+@api @wildcard @vagrant
Feature: Searches that contain wildcard matches
Scenario Outline: Wildcards match plain matches
When I api search for pi<wildcard>les
--
To view, visit https://gerrit.wikimedia.org/r/271756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0fa9f126b9448c86f8e7eced13611cac6c38277c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
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
