jenkins-bot has submitted this change and it was merged.
Change subject: Test fixtures: standardize props on underscores
......................................................................
Test fixtures: standardize props on underscores
Change-Id: I7cc890978fcc2ea2be64b77c35b723fd55ac0759
---
M tests/CNBannerChoicesResourceLoaderModuleTest.php
M tests/CentralNoticeTestFixtures.php
M tests/data/AllocationsFixtures.json
M
tests/qunit/ext.centralNotice.bannerController.lib/bannerController.lib.tests.js
4 files changed, 106 insertions(+), 106 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/CNBannerChoicesResourceLoaderModuleTest.php
b/tests/CNBannerChoicesResourceLoaderModuleTest.php
index d4182c4..c15417d 100644
--- a/tests/CNBannerChoicesResourceLoaderModuleTest.php
+++ b/tests/CNBannerChoicesResourceLoaderModuleTest.php
@@ -40,7 +40,7 @@
protected function addSomeBanners() {
$fixtures = CentralNoticeTestFixtures::allocationsData();
- $completeness = $fixtures['testCases']['completeness'];
+ $completeness = $fixtures['test_cases']['completeness'];
$this->cnFixtures->setupTestCaseFromFixtureData( $completeness
);
}
diff --git a/tests/CentralNoticeTestFixtures.php
b/tests/CentralNoticeTestFixtures.php
index 62fef39..86f4e09 100644
--- a/tests/CentralNoticeTestFixtures.php
+++ b/tests/CentralNoticeTestFixtures.php
@@ -29,8 +29,8 @@
static::$defaultBanner = array(
'bucket' => 0,
'body' => 'testing',
- 'displayAnon' => true,
- 'displayAccount' => true,
+ 'display_anon' => true,
+ 'display_account' => true,
'fundraising' => 1,
'autolink' => 0,
'landingPages' => 'JA1, JA2',
@@ -56,7 +56,7 @@
/**
* Set up a test case as required for shared JSON data. Process the
special
- * startDaysFromNow and endDaysFromNow properties, ensure an empty
+ * start_days_from_now and end_days_from_now properties, ensure an empty
* countries property for non-geotargetted campaigns, and add dummy
* banner bodies.
*
@@ -104,7 +104,7 @@
/**
* Set campaign start and end times for test case fixtures using the
- * startDaysFromNow and endDaysFromNow properties.
+ * start_days_from_now and end_days_from_now properties.
*
* Note: this logic is repeated in client-side tests.
* @see setTestCaseStartEnd() in bannerController.lib.tests.js
@@ -118,12 +118,12 @@
foreach ( $testCase['setup']['campaigns'] as &$campaign ) {
$start = CentralNoticeTestFixtures::makeTimestamp(
- $now, $campaign['startDaysFromNow'] );
+ $now, $campaign['start_days_from_now']
);
$campaign['startTs'] = wfTimestamp( TS_MW, $start );
$end = CentralNoticeTestFixtures::makeTimestamp(
- $now, $campaign['endDaysFromNow'] );
+ $now, $campaign['end_days_from_now'] );
$campaign['endTs'] = wfTimestamp( TS_MW, $end );
}
@@ -131,16 +131,16 @@
foreach ( $testCase['choices'] as &$choice ) {
$choice['start'] =
CentralNoticeTestFixtures::makeTimestamp(
- $now, $choice['startDaysFromNow'] );
+ $now, $choice['start_days_from_now'] );
$choice['end'] =
CentralNoticeTestFixtures::makeTimestamp(
- $now, $choice['endDaysFromNow'] );
+ $now, $choice['end_days_from_now'] );
// Unset these special properties from choices, for
tests that
// compare fixture choices to actual choices produced
by the code
// under test.
- unset( $choice['startDaysFromNow'] );
- unset( $choice['endDaysFromNow'] );
+ unset( $choice['start_days_from_now'] );
+ unset( $choice['end_days_from_now'] );
}
}
@@ -234,8 +234,8 @@
$bannerSpec['name'],
$bannerSpec['body'],
$this->user,
- $bannerSpec['displayAnon'],
- $bannerSpec['displayAccount'],
+ $bannerSpec['display_anon'],
+ $bannerSpec['display_account'],
$bannerSpec['fundraising'],
isset( $bannerSpec['autolink'] ) ?
$bannerSpec['autolink'] : 0,
isset( $bannerSpec['landingPages'] ) ?
$bannerSpec['landingPages'] : ''
@@ -330,7 +330,7 @@
$data = CentralNoticeTestFixtures::allocationsData();
$dataForTests = array();
- foreach ( $data['testCases'] as $name => $testCase ) {
+ foreach ( $data['test_cases'] as $name => $testCase ) {
$dataForTests[] = array( $name, $testCase );
}
diff --git a/tests/data/AllocationsFixtures.json
b/tests/data/AllocationsFixtures.json
index eadc9b4..3febe7d 100644
--- a/tests/data/AllocationsFixtures.json
+++ b/tests/data/AllocationsFixtures.json
@@ -1,13 +1,13 @@
{
- "testCases": {
+ "test_cases": {
"completeness": {
"setup": {
"campaigns": [
{
"name": "c1",
"enabled": 1,
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 50,
"geotargeted": true,
@@ -23,8 +23,8 @@
"name": "b1",
"weight": 5,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -37,8 +37,8 @@
"choices": [
{
"name": "c1",
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 50,
"bucket_count": 1,
@@ -74,8 +74,8 @@
{
"name": "c1",
"enabled": 1,
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 3,
"throttle": 60,
"geotargeted": false,
@@ -86,8 +86,8 @@
"name": "c1b1",
"weight": 25,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -97,8 +97,8 @@
"name": "c1b2",
"weight": 25,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -109,8 +109,8 @@
{
"name": "c2",
"enabled": 1,
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"geotargeted": false,
@@ -121,8 +121,8 @@
"name": "c2b1",
"weight": 25,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -132,8 +132,8 @@
"name": "c2b2",
"weight": 25,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -146,8 +146,8 @@
"choices": [
{
"name": "c1",
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 3,
"throttle": 60,
"bucket_count": 1,
@@ -179,8 +179,8 @@
},
{
"name": "c2",
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"bucket_count": 1,
@@ -225,8 +225,8 @@
{
"name": "c1",
"enabled": 1,
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"geotargeted": false,
@@ -237,8 +237,8 @@
"name": "b1",
"weight": 5,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -248,8 +248,8 @@
"name": "b2",
"weight": 100,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -259,8 +259,8 @@
"name": "b3",
"weight": 100,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -273,8 +273,8 @@
"choices": [
{
"name": "c1",
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"bucket_count": 1,
@@ -329,8 +329,8 @@
{
"name": "c1",
"enabled": 1,
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 10,
"geotargeted": false,
@@ -341,8 +341,8 @@
"name": "b1",
"weight": 25,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1
}
]
@@ -352,8 +352,8 @@
"choices": [
{
"name": "c1",
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 10,
"bucket_count": 1,
@@ -384,8 +384,8 @@
{
"name": "c1",
"enabled": 1,
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"geotargeted": false,
@@ -396,8 +396,8 @@
"name": "c1b1",
"weight": 25,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -408,8 +408,8 @@
{
"name": "c2",
"enabled": 1,
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 2,
"throttle": 100,
"geotargeted": false,
@@ -420,8 +420,8 @@
"name": "c2b1",
"weight": 25,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -434,8 +434,8 @@
"choices": [
{
"name": "c1",
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"bucket_count": 1,
@@ -456,8 +456,8 @@
},
{
"name": "c2",
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 2,
"throttle": 100,
"bucket_count": 1,
@@ -483,14 +483,14 @@
}
},
- "geoInCountry": {
+ "geo_in_country": {
"setup": {
"campaigns": [
{
"name": "c1",
"enabled": 1,
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"projects": ["wikipedia"],
@@ -505,8 +505,8 @@
"name": "b1",
"weight": 25,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -519,8 +519,8 @@
"choices": [
{
"name": "c1",
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"bucket_count": 1,
@@ -549,14 +549,14 @@
}
},
- "geoNotInCountry": {
+ "geo_not_in_country": {
"setup": {
"campaigns": [
{
"name": "c1",
"enabled": 1,
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"geotargeted": true,
@@ -571,8 +571,8 @@
"name": "b1",
"weight": 25,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -585,8 +585,8 @@
"choices": [
{
"name": "c1",
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"bucket_count": 1,
@@ -614,14 +614,14 @@
}
},
- "notInProject": {
+ "not_in_project": {
"setup": {
"campaigns": [
{
"name": "c1",
"enabled": 1,
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"geotargeted": false,
@@ -632,8 +632,8 @@
"name": "b1",
"weight": 25,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -649,14 +649,14 @@
}
},
- "notInLanguage": {
+ "not_in_language": {
"setup": {
"campaigns": [
{
"name": "c1",
"enabled": 1,
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"geotargeted": false,
@@ -667,8 +667,8 @@
"name": "b1",
"weight": 25,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -684,14 +684,14 @@
}
},
- "notInTimeWindow": {
+ "not_in_time_window": {
"setup": {
"campaigns": [
{
"name": "c1",
"enabled": 1,
- "startDaysFromNow": 1,
- "endDaysFromNow": 2,
+ "start_days_from_now": 1,
+ "end_days_from_now": 2,
"preferred": 1,
"throttle": 100,
"geotargeted": false,
@@ -702,8 +702,8 @@
"name": "b1",
"weight": 25,
"bucket": 0,
- "displayAnon": true,
- "displayAccount": true,
+ "display_anon": true,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -719,14 +719,14 @@
}
},
- "notAnonymous": {
+ "not_anonymous": {
"setup": {
"campaigns": [
{
"name": "c1",
"enabled": 1,
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"geotargeted": false,
@@ -737,8 +737,8 @@
"name": "b1",
"weight": 25,
"bucket": 0,
- "displayAnon": false,
- "displayAccount": true,
+ "display_anon": false,
+ "display_account": true,
"fundraising": 1,
"devices": [
"desktop"
@@ -751,8 +751,8 @@
"choices": [
{
"name": "c1",
- "startDaysFromNow": 0,
- "endDaysFromNow": 1,
+ "start_days_from_now": 0,
+ "end_days_from_now": 1,
"preferred": 1,
"throttle": 100,
"bucket_count": 1,
diff --git
a/tests/qunit/ext.centralNotice.bannerController.lib/bannerController.lib.tests.js
b/tests/qunit/ext.centralNotice.bannerController.lib/bannerController.lib.tests.js
index fba35a4..6c7760f 100644
---
a/tests/qunit/ext.centralNotice.bannerController.lib/bannerController.lib.tests.js
+++
b/tests/qunit/ext.centralNotice.bannerController.lib/bannerController.lib.tests.js
@@ -12,7 +12,7 @@
QUnit.test( 'allocations test cases', function( assert ) {
var testFixtures = mw.centralNoticeTestFixtures,
- testCases = testFixtures.testCases,
+ testCases = testFixtures.test_cases,
lib = mw.cnBannerControllerLib;
QUnit.expect( Object.keys( testCases ).length );
@@ -81,13 +81,13 @@
for ( i = 0; i < testCaseSpec.choices.length; i++ ) {
choice = testCaseSpec.choices[i];
- choice.start = makeTimestamp( now,
choice.startDaysFromNow );
- choice.end = makeTimestamp( now, choice.endDaysFromNow);
+ choice.start = makeTimestamp( now,
choice.start_days_from_now );
+ choice.end = makeTimestamp( now,
choice.end_days_from_now);
// Remove these special properties from choices, to
make the
// choices data mirror the real data structure.
- delete choice.startDaysFromNow;
- delete choice.endDaysFromNow;
+ delete choice.start_days_from_now;
+ delete choice.end_days_from_now;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/186407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cc890978fcc2ea2be64b77c35b723fd55ac0759
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Katie Horn <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
