Skip to content

Commit 42cbbda

Browse files
committed
Clean up test files
1 parent f75765a commit 42cbbda

File tree

2 files changed

+48
-19
lines changed

2 files changed

+48
-19
lines changed

tests/datetime-spec.js

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
/*
2+
* Setup
3+
*/
4+
15
// Create the dom before requiring react
2-
var DOM = require( './testdom');
6+
var DOM = require('./testDOM');
37
DOM();
48

59
// Needs to be global to work in Travis CI
@@ -12,6 +16,10 @@ var Datetime = require('../DateTime'),
1216
TestUtils = require('react-addons-test-utils')
1317
;
1418

19+
/*
20+
* Utility Functions
21+
*/
22+
1523
var createDatetime = function( props ) {
1624
document.body.innerHTML = '<div id="root"></div>';
1725

@@ -94,6 +102,10 @@ var date = new Date( 2000, 0, 15, 2, 2, 2, 2 ),
94102
currentYear = new Date().getFullYear()
95103
;
96104

105+
/*
106+
* Tests
107+
*/
108+
97109
describe( 'Datetime', function() {
98110
it( 'Create Datetime', function() {
99111
var component = createDatetime({});
@@ -355,16 +367,16 @@ describe( 'Datetime', function() {
355367
});
356368

357369
it( 'Time pickers depends on the time format', function() {
358-
createDatetime({ viewMode: 'time', timeFormat: "HH:mm:ss:SSS"});
370+
createDatetime({ viewMode: 'time', timeFormat: 'HH:mm:ss:SSS'});
359371
assert.equal( document.querySelectorAll('.rdtCounter').length, 4 );
360372

361-
createDatetime({ viewMode: 'time', timeFormat: "HH:mm:ss"});
373+
createDatetime({ viewMode: 'time', timeFormat: 'HH:mm:ss'});
362374
assert.equal( document.querySelectorAll('.rdtCounter').length, 3 );
363375

364-
createDatetime({ viewMode: 'time', timeFormat: "HH:mm"});
376+
createDatetime({ viewMode: 'time', timeFormat: 'HH:mm'});
365377
assert.equal( document.querySelectorAll('.rdtCounter').length, 2 );
366378

367-
createDatetime({ viewMode: 'time', timeFormat: "HH"});
379+
createDatetime({ viewMode: 'time', timeFormat: 'HH'});
368380
assert.equal( document.querySelectorAll('.rdtCounter').length, 1 );
369381
});
370382

@@ -425,7 +437,7 @@ describe( 'Datetime', function() {
425437

426438
ev.click( dt.month(1) );
427439
assert.equal( dt.view().className, 'rdtDays' );
428-
assert.equal( dt.switcher().getAttribute('data-value'), "1" );
440+
assert.equal( dt.switcher().getAttribute('data-value'), '1' );
429441
});
430442

431443
it( 'increase year', function() {
@@ -475,7 +487,7 @@ describe( 'Datetime', function() {
475487
assert.equal( dt.isOpen(), true );
476488
});
477489

478-
it( 'onSelect', function( done ) {
490+
it( 'onChange', function( done ) {
479491
createDatetime({ defaultValue: date, onChange: function( selected ) {
480492
assert.equal( selected.date(), 2 );
481493
assert.equal( selected.month(), mDate.month() );
@@ -486,7 +498,7 @@ describe( 'Datetime', function() {
486498
ev.click( dt.day( 2 ) );
487499
});
488500

489-
it( 'multiple onSelect', function( done ) {
501+
it( 'multiple onChange', function( done ) {
490502
var i = 0;
491503
createDatetime({ defaultValue: date, onChange: function( selected ) {
492504
i++;
@@ -514,7 +526,11 @@ describe( 'Datetime', function() {
514526
});
515527

516528
it( 'onBlur', function() {
529+
let onBlurCalled = false;
517530
createDatetime({ value: date, onBlur: function( selected ) {
531+
// TODO: This is never called
532+
onBlurCalled = true;
533+
assert.equal( true, false ); // Just to prove that this code is not being run
518534
assert.equal( dt.dt().className.indexOf( 'rdtOpen' ), -1 );
519535
assert.equal( selected.date(), mDate.date() );
520536
assert.equal( selected.month(), mDate.month() );
@@ -524,8 +540,9 @@ describe( 'Datetime', function() {
524540

525541
assert.equal( dt.isOpen(), false );
526542
ev.focus( dt.input() );
527-
assert.equal(dt.isOpen(), true );
543+
assert.equal( dt.isOpen(), true );
528544
trigger( 'click', document.body );
545+
// assert.equal( onBlurCalled, true );
529546
});
530547

531548
it( 'closeOnTab:true', function() {
@@ -534,9 +551,9 @@ describe( 'Datetime', function() {
534551
assert.equal( dt.isOpen(), false );
535552
ev.focus( dt.input() );
536553
assert.equal(dt.isOpen(), true );
537-
TestUtils.Simulate.keyDown(dt.input(), {key: "Tab", keyCode: 9, which: 9});
554+
TestUtils.Simulate.keyDown(dt.input(), {key: 'Tab', keyCode: 9, which: 9});
538555
assert.equal( dt.isOpen(), false );
539-
trigger( 'click', document.body );
556+
// trigger( 'click', document.body ); // Does nothing ??
540557
});
541558

542559
it( 'closeOnTab:false', function() {
@@ -545,14 +562,14 @@ describe( 'Datetime', function() {
545562
assert.equal( dt.isOpen(), false );
546563
ev.focus( dt.input() );
547564
assert.equal(dt.isOpen(), true );
548-
TestUtils.Simulate.keyDown(dt.input(), {key: "Tab", keyCode: 9, which: 9});
565+
TestUtils.Simulate.keyDown(dt.input(), {key: 'Tab', keyCode: 9, which: 9});
549566
assert.equal(dt.isOpen(), true );
550-
trigger( 'click', document.body );
567+
// trigger( 'click', document.body ); // Does nothing ??
551568
});
552569

553570
it( 'increase time', function( done ) {
554571
var i = 0;
555-
createDatetime({ timeFormat: "HH:mm:ss:SSS", viewMode: 'time', defaultValue: date, onChange: function( selected ) {
572+
createDatetime({ timeFormat: 'HH:mm:ss:SSS', viewMode: 'time', defaultValue: date, onChange: function( selected ) {
556573
i++;
557574
if( i > 2 ) {
558575
assert.equal( selected.hour(), 3 );
@@ -575,7 +592,7 @@ describe( 'Datetime', function() {
575592

576593
it( 'decrease time', function( done ) {
577594
var i = 0;
578-
createDatetime({ timeFormat: "HH:mm:ss:SSS", viewMode: 'time', defaultValue: date, onChange: function( selected ) {
595+
createDatetime({ timeFormat: 'HH:mm:ss:SSS', viewMode: 'time', defaultValue: date, onChange: function( selected ) {
579596
i++;
580597
if( i > 2 ) {
581598
assert.equal( selected.hour(), 1 );
@@ -597,7 +614,7 @@ describe( 'Datetime', function() {
597614
});
598615

599616
it( 'long increase time', function( done ) {
600-
createDatetime({ timeFormat: "HH:mm:ss:SSS", viewMode: 'time', defaultValue: date});
617+
createDatetime({ timeFormat: 'HH:mm:ss:SSS', viewMode: 'time', defaultValue: date});
601618

602619
trigger( 'mousedown', dt.timeUp( 0 ) );
603620
setTimeout( function() {
@@ -609,7 +626,7 @@ describe( 'Datetime', function() {
609626
});
610627

611628
it( 'long decrease time', function( done ) {
612-
createDatetime({ timeFormat: "HH:mm:ss:SSS", viewMode: 'time', defaultValue: date});
629+
createDatetime({ timeFormat: 'HH:mm:ss:SSS', viewMode: 'time', defaultValue: date});
613630

614631
trigger( 'mousedown', dt.timeDown( 0 ) );
615632
setTimeout( function() {
@@ -622,7 +639,7 @@ describe( 'Datetime', function() {
622639

623640
it( 'increase time with timeConstraints', function( done ) {
624641
var i = 0;
625-
createDatetime({ timeFormat: "HH:mm:ss:SSS", viewMode: 'time', defaultValue: date, onChange: function( selected ) {
642+
createDatetime({ timeFormat: 'HH:mm:ss:SSS', viewMode: 'time', defaultValue: date, onChange: function( selected ) {
626643
i++;
627644
if( i > 2 ) {
628645
assert.equal( selected.minute(), 17 );
@@ -643,7 +660,7 @@ describe( 'Datetime', function() {
643660
});
644661

645662
it( 'decrease time with timeConstraints', function( done ) {
646-
createDatetime({ timeFormat: "HH:mm:ss:SSS", viewMode: 'time', defaultValue: date, onChange: function( selected ) {
663+
createDatetime({ timeFormat: 'HH:mm:ss:SSS', viewMode: 'time', defaultValue: date, onChange: function( selected ) {
647664
assert.equal( selected.minute(), 47 );
648665
done();
649666
}, timeConstraints: { minutes: { step: 15 }}});

tests/testDOM.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
module.exports = function( markup ) {
2+
if (typeof document !== 'undefined') return;
3+
4+
var jsdom = require('jsdom').jsdom;
5+
global.document = jsdom(markup || '<!doctype html><html><body></body></html>');
6+
global.window = document.defaultView;
7+
global.navigator = global.window.navigator = {};
8+
navigator.userAgent = 'NodeJs JsDom';
9+
navigator.appVersion = '';
10+
11+
return document;
12+
};

0 commit comments

Comments
 (0)