Daniel Werner has uploaded a new change for review.

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


Change subject: (bug 48145) tests for TimeInput expert
......................................................................

(bug 48145) tests for TimeInput expert

* also splits TimeInput and TimeValue expert's resource loader modules into two 
separate ones.
* minor documentation updates

Change-Id: Ied337b2c904ca8a43658956fd72df4cb88de6484
---
M ValueView/ValueView.resources.php
M ValueView/ValueView.tests.qunit.php
M ValueView/resources/jquery.valueview/valueview.experts/experts.TimeValue.js
A 
ValueView/tests/qunit/jquery.valueview/valueview.experts/experts.TimeInput.tests.js
M ValueView/tests/qunit/jquery.valueview/valueview.tests.testExpert.js
5 files changed, 54 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DataValues 
refs/changes/99/62799/1

diff --git a/ValueView/ValueView.resources.php 
b/ValueView/ValueView.resources.php
index aee0099..9d475af 100644
--- a/ValueView/ValueView.resources.php
+++ b/ValueView/ValueView.resources.php
@@ -193,15 +193,23 @@
                        ),
                ),
 
-               'jquery.valueview.experts.timevalue' => $moduleTemplate + array(
+               'jquery.valueview.experts.timeinput' => $moduleTemplate + array(
                        'scripts' => array(
                                
'jquery.valueview/valueview.experts/experts.TimeInput.js',
+                       ),
+                       'dependencies' => array(
+                               'jquery.valueview.experts.stringvalue',
+                       ),
+               ),
+
+               'jquery.valueview.experts.timevalue' => $moduleTemplate + array(
+                       'scripts' => array(
                                
'jquery.valueview/valueview.experts/experts.TimeValue.js',
                        ),
                        'dependencies' => array(
                                'jquery.valueview.experts.staticdom',
                                'jquery.valueview.BifidExpert',
-                               'jquery.valueview.experts.stringvalue',
+                               'jquery.valueview.experts.timeinput',
                        ),
                ),
 
diff --git a/ValueView/ValueView.tests.qunit.php 
b/ValueView/ValueView.tests.qunit.php
index 25606d3..ec23a07 100644
--- a/ValueView/ValueView.tests.qunit.php
+++ b/ValueView/ValueView.tests.qunit.php
@@ -101,6 +101,15 @@
                                'jquery.valueview.experts.stringvalue',
                        ),
                ),
+
+               'jquery.valueview.experts.timeinput.tests' => array(
+                       'scripts' => array(
+                               
"$bp/jquery.valueview/valueview.experts/experts.TimeInput.tests.js",
+                       ),
+                       'dependencies' => array(
+                               'jquery.valueview.experts.timeinput',
+                       ),
+               ),
        );
 
 } );
diff --git 
a/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeValue.js 
b/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeValue.js
index 129bd4d..c32e6e6 100644
--- 
a/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeValue.js
+++ 
b/ValueView/resources/jquery.valueview/valueview.experts/experts.TimeValue.js
@@ -16,7 +16,7 @@
         * @since 0.1
         *
         * @constructor
-        * @extends jQuery.valueview.experts.StringValue
+        * @extends jQuery.valueview.experts.BifidExpert
         */
        vv.experts.TimeValue = vv.expert( 'timevalue', PARENT, {
                /**
diff --git 
a/ValueView/tests/qunit/jquery.valueview/valueview.experts/experts.TimeInput.tests.js
 
b/ValueView/tests/qunit/jquery.valueview/valueview.experts/experts.TimeInput.tests.js
new file mode 100644
index 0000000..481d5df
--- /dev/null
+++ 
b/ValueView/tests/qunit/jquery.valueview/valueview.experts/experts.TimeInput.tests.js
@@ -0,0 +1,33 @@
+/**
+ * @since 0.1
+ * @ingroup ValueView
+ *
+ * @licence GNU GPL v2+
+ * @author Daniel Werner < daniel.wer...@wikimedia.de >
+ */
+ ( function( $, QUnit, valueview, TimeParser ) {
+
+       'use strict';
+
+       var testExpert = valueview.tests.testExpert;
+
+       QUnit.module( 'jquery.valueview.experts.TimeInput' );
+
+       testExpert( {
+               expertConstructor: valueview.experts.TimeInput,
+               rawValues: {
+                       valid: [
+                               new time.Time( '1. April 1989' ),
+                               new time.Time( '123 bce' ),
+                               new time.Time( '1984' )
+                       ],
+                       unknown: 
testExpert.basicTestDefinition.rawValues.unknown.concat( [
+                               42,
+                               '1. 1984',
+                               new time.Time( 'foooo - invalid time' )
+                       ] )
+               },
+               relatedValueParser: TimeParser
+       } );
+
+}( jQuery, QUnit, jQuery.valueview, valueParsers.TimeParser ) );
diff --git 
a/ValueView/tests/qunit/jquery.valueview/valueview.tests.testExpert.js 
b/ValueView/tests/qunit/jquery.valueview/valueview.tests.testExpert.js
index e7a333d..1d51dd5 100644
--- a/ValueView/tests/qunit/jquery.valueview/valueview.tests.testExpert.js
+++ b/ValueView/tests/qunit/jquery.valueview/valueview.tests.testExpert.js
@@ -145,7 +145,7 @@
 
                                assert.ok(
                                        args.expert.rawValueCompare( testValue, 
otherValue ) === successExpected,
-                                       'Raw value "' + valueDescription( 
testValue ) + ' does ' +
+                                       'Raw value ' + valueDescription( 
testValue ) + ' does ' +
                                                ( successExpected ? '' : 'not ' 
) + 'equal raw value "' +
                                                valueDescription( otherValue )
                                );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ied337b2c904ca8a43658956fd72df4cb88de6484
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DataValues
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner <daniel.wer...@wikimedia.de>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to