Zfilipin has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/274392

Change subject: WIP Merge tests/browser/environments.yml and 
tests/browser/config/config.yml
......................................................................

WIP Merge tests/browser/environments.yml and tests/browser/config/config.yml

Bug: T128097
Change-Id: I2f4350d8dd427fcdd1d58a4778b0a4ce0f9d365c
---
R Gemfile
R Gemfile.lock
M tests/browser/environments.yml
M tests/browser/features/step_definitions/non_existing_item_steps.rb
4 files changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/92/274392/1

diff --git a/tests/browser/Gemfile b/Gemfile
similarity index 100%
rename from tests/browser/Gemfile
rename to Gemfile
diff --git a/tests/browser/Gemfile.lock b/Gemfile.lock
similarity index 98%
rename from tests/browser/Gemfile.lock
rename to Gemfile.lock
index 9fdee44..8ab8677 100644
--- a/tests/browser/Gemfile.lock
+++ b/Gemfile.lock
@@ -129,3 +129,6 @@
   parallel_tests
   require_all
   rubocop
+
+BUNDLED WITH
+   1.10.6
diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
index db32c74..80122ed 100644
--- a/tests/browser/environments.yml
+++ b/tests/browser/environments.yml
@@ -14,14 +14,17 @@
 #   export MEDIAWIKI_USER=Selenium_user2
 #   bundle exec cucumber
 #
-mw-vagrant-host:
+mw-vagrant-host: &default
   language_code: en
   browser: firefox
-  mediawiki_url: http://127.0.0.1:8080/wiki/
+  item_id_prefix: 'Q'
+  item_namespace: ''
+  mediawiki_url: http://wikidata.wiki.local.wmftest.net:8080/wiki/
   mediawiki_user: Selenium_user
   mediawiki_password: vagrant
+  keep_browser_open: 'true'
 
-mw-vagrant-guest: &default
+mw-vagrant-guest:
   language_code: en
   browser: firefox
   mediawiki_url: http://127.0.0.1/wiki/
diff --git a/tests/browser/features/step_definitions/non_existing_item_steps.rb 
b/tests/browser/features/step_definitions/non_existing_item_steps.rb
index c82d4fc..904bc29 100644
--- a/tests/browser/features/step_definitions/non_existing_item_steps.rb
+++ b/tests/browser/features/step_definitions/non_existing_item_steps.rb
@@ -12,6 +12,6 @@
 Then(/^check if this page behaves correctly$/) do
   on_page(NonExistingItemPage) do |page|
     expect(page.first_heading?).to be true
-    expect(page.first_heading_element.text).to be == ENV['ITEM_NAMESPACE'] + 
ENV['ITEM_ID_PREFIX'] + 'xy'
+    expect(page.first_heading_element.text).to be == lookup(:item_namespace, 
default: -> {''}) + lookup(:item_id_prefix) + 'xy'
   end
 end

-- 
To view, visit https://gerrit.wikimedia.org/r/274392
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f4350d8dd427fcdd1d58a4778b0a4ce0f9d365c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
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

Reply via email to