WikidataBuilder has uploaded a new change for review.
https://gerrit.wikimedia.org/r/123568
Change subject: New Wikidata Build - 03/04/2014 10:00
......................................................................
New Wikidata Build - 03/04/2014 10:00
Change-Id: I36e6bf04f2df4fa248573621c0293bf4409eb2d4
---
M composer.lock
M extensions/Wikibase/tests/browser/features/step_definitions/entity_steps.rb
M extensions/Wikibase/tests/browser/features/support/modules/url_module.rb
M
extensions/Wikibase/tests/browser/features/support/modules/wikibase_api_module.rb
A extensions/Wikibase/tests/browser/features/support/pages/repo_logout_page.rb
M vendor/autoload.php
M vendor/composer/autoload_real.php
M vendor/composer/installed.json
8 files changed, 60 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/68/123568/1
diff --git a/composer.lock b/composer.lock
index c463f4f..f14f91a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -856,12 +856,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "30d19d82e36edac3b29f7fe674802abd6cb43904"
+ "reference": "4a4ea573462ac1a024e662339a130bdbf394379e"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/30d19d82e36edac3b29f7fe674802abd6cb43904";,
- "reference": "30d19d82e36edac3b29f7fe674802abd6cb43904",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/4a4ea573462ac1a024e662339a130bdbf394379e";,
+ "reference": "4a4ea573462ac1a024e662339a130bdbf394379e",
"shasum": ""
},
"require": {
@@ -920,7 +920,7 @@
"wikibaserepo",
"wikidata"
],
- "time": "2014-04-03 07:40:22"
+ "time": "2014-04-03 09:07:03"
}
],
"packages-dev": [
diff --git
a/extensions/Wikibase/tests/browser/features/step_definitions/entity_steps.rb
b/extensions/Wikibase/tests/browser/features/step_definitions/entity_steps.rb
index 560114e..e110e6f 100644
---
a/extensions/Wikibase/tests/browser/features/step_definitions/entity_steps.rb
+++
b/extensions/Wikibase/tests/browser/features/step_definitions/entity_steps.rb
@@ -10,10 +10,34 @@
visit(RepoLoginPage).login_with(ENV["WB_REPO_USERNAME"],
ENV["WB_REPO_PASSWORD"])
end
+Given /^I am not logged in to the repo$/ do
+ visit(RepoLogoutPage)
+end
+
Given /^I am on an item page$/ do
- item_data = '{"labels":{"en":{"language":"en","value":"' +
generate_random_string(8) +
'"}},"descriptions":{"en":{"language":"en","value":"' +
generate_random_string(20) + '"}}}'
+ step 'I have an item to test'
+ step 'I am on the page of the item to test'
+end
+
+Given /^I have an item to test$/ do
+ step 'I have an item with label "' + generate_random_string(8) + '" and
description "' + generate_random_string(20) + '"'
+end
+
+Given /^I have an item with empty label and description$/ do
+ step 'I have an item with label "" and description ""'
+end
+
+Given /^I have an item with label "([^"]*)"$/ do |label|
+ step 'I have an item with label "' + label + '" and description "' +
generate_random_string(20) + '"'
+end
+
+Given /^I have an item with label "(.*)" and description "(.*)"$/ do
|label,description|
+ item_data = '{"labels":{"en":{"language":"en","value":"' + label +
'"}},"descriptions":{"en":{"language":"en","value":"' + description + '"}}}'
wb_api = WikibaseAPI::Gateway.new(URL.repo_api)
@item_under_test = wb_api.wb_create_entity(item_data, "item")
+end
+
+Given /^I am on the page of the item to test$/ do
on(ItemPage).navigate_to_entity @item_under_test["url"]
end
@@ -37,10 +61,8 @@
end
Given /^I am on an item page with empty label and description$/ do
- item_data = '{"labels":{"en":{"language":"en","value":"' + '' +
'"}},"descriptions":{"en":{"language":"en","value":"' + '' + '"}}}'
- wb_api = WikibaseAPI::Gateway.new(URL.repo_api)
- @item_under_test = wb_api.wb_create_entity(item_data, "item")
- on(ItemPage).navigate_to_entity @item_under_test["url"]
+ step 'I have an item with empty label and description'
+ step 'I am on the page of the item to test'
end
Given /^The following sitelinks do not exist:$/ do |sitelinks|
diff --git
a/extensions/Wikibase/tests/browser/features/support/modules/url_module.rb
b/extensions/Wikibase/tests/browser/features/support/modules/url_module.rb
index f491505..7c08e75 100644
--- a/extensions/Wikibase/tests/browser/features/support/modules/url_module.rb
+++ b/extensions/Wikibase/tests/browser/features/support/modules/url_module.rb
@@ -11,12 +11,14 @@
module URL
def self.client_url(name)
url = ENV["WIKIDATA_CLIENT_URL"]
- "#{url}#{name}"
+ lang = ENV["LANGUAGE_CODE"]
+ "#{url}#{name}?setlang=#{lang}"
end
def self.repo_url(name)
url = ENV["WIKIDATA_REPO_URL"]
- "#{url}#{name}"
+ lang = ENV["LANGUAGE_CODE"]
+ "#{url}#{name}?setlang=#{lang}"
end
def self.repo_api()
diff --git
a/extensions/Wikibase/tests/browser/features/support/modules/wikibase_api_module.rb
b/extensions/Wikibase/tests/browser/features/support/modules/wikibase_api_module.rb
index 3e0d9b3..66363f3 100644
---
a/extensions/Wikibase/tests/browser/features/support/modules/wikibase_api_module.rb
+++
b/extensions/Wikibase/tests/browser/features/support/modules/wikibase_api_module.rb
@@ -40,7 +40,7 @@
check_wb_api_success(resp)
id = resp["entity"]["id"]
- url = URL.repo_url(ENV["ITEM_NAMESPACE"] + id + "?setlang=" +
ENV["LANGUAGE_CODE"])
+ url = URL.repo_url(ENV["ITEM_NAMESPACE"] + id)
entity_data = ActiveSupport::JSON.decode(data)
{"id" => id, "url" => url, "label" =>
entity_data["labels"]["en"]["value"],
diff --git
a/extensions/Wikibase/tests/browser/features/support/pages/repo_logout_page.rb
b/extensions/Wikibase/tests/browser/features/support/pages/repo_logout_page.rb
new file mode 100644
index 0000000..867958c
--- /dev/null
+++
b/extensions/Wikibase/tests/browser/features/support/pages/repo_logout_page.rb
@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+# Wikidata UI tests
+#
+# Author:: Thiemo Mättig ([email protected])
+# License:: GNU GPL v2+
+#
+# page object for repo logout page
+
+class RepoLogoutPage
+ include PageObject
+
+ page_url URL.repo_url("Special:UserLogout")
+
+end
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 6783f02..f1eca73 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInitd6079f42d02dfb2ba25540b6c0528712::getLoader();
+return ComposerAutoloaderInita7a656b08d7c76b1b995677a4e491fdf::getLoader();
diff --git a/vendor/composer/autoload_real.php
b/vendor/composer/autoload_real.php
index 516efc9..459389c 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInitd6079f42d02dfb2ba25540b6c0528712
+class ComposerAutoloaderInita7a656b08d7c76b1b995677a4e491fdf
{
private static $loader;
@@ -19,9 +19,9 @@
return self::$loader;
}
-
spl_autoload_register(array('ComposerAutoloaderInitd6079f42d02dfb2ba25540b6c0528712',
'loadClassLoader'), true, true);
+
spl_autoload_register(array('ComposerAutoloaderInita7a656b08d7c76b1b995677a4e491fdf',
'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-
spl_autoload_unregister(array('ComposerAutoloaderInitd6079f42d02dfb2ba25540b6c0528712',
'loadClassLoader'));
+
spl_autoload_unregister(array('ComposerAutoloaderInita7a656b08d7c76b1b995677a4e491fdf',
'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
@@ -45,14 +45,14 @@
$includeFiles = require __DIR__ . '/autoload_files.php';
foreach ($includeFiles as $file) {
- composerRequired6079f42d02dfb2ba25540b6c0528712($file);
+ composerRequirea7a656b08d7c76b1b995677a4e491fdf($file);
}
return $loader;
}
}
-function composerRequired6079f42d02dfb2ba25540b6c0528712($file)
+function composerRequirea7a656b08d7c76b1b995677a4e491fdf($file)
{
require $file;
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index e16df8f..c07f612 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -883,12 +883,12 @@
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/mediawiki-extensions-Wikibase.git";,
- "reference": "30d19d82e36edac3b29f7fe674802abd6cb43904"
+ "reference": "4a4ea573462ac1a024e662339a130bdbf394379e"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/30d19d82e36edac3b29f7fe674802abd6cb43904";,
- "reference": "30d19d82e36edac3b29f7fe674802abd6cb43904",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-extensions-Wikibase/zipball/4a4ea573462ac1a024e662339a130bdbf394379e";,
+ "reference": "4a4ea573462ac1a024e662339a130bdbf394379e",
"shasum": ""
},
"require": {
@@ -907,7 +907,7 @@
"wikibase/data-model": "~0.7.2",
"wikibase/easyrdf_lite": "~0.8.1"
},
- "time": "2014-04-03 07:40:22",
+ "time": "2014-04-03 09:07:03",
"type": "mediawiki-extension",
"installation-source": "dist",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/123568
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I36e6bf04f2df4fa248573621c0293bf4409eb2d4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: master
Gerrit-Owner: WikidataBuilder <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
