Skip to content

Commit 452de60

Browse files
dalelottsdalelotts
committed
Fix #218, add test to detect that dropdown is toggled correctly when jquery, bootstrap, and dropdownselect are all specified (this test is not working just yet).
1 parent 49a075b commit 452de60

File tree

7 files changed

+65
-28
lines changed

7 files changed

+65
-28
lines changed

‎bower.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"test*"
2424
],
2525
"dependencies": {
26-
"angular": "^1.4.4",
26+
"angular": "^1.4.7",
2727
"moment": "^2.10.6"
2828
},
2929
"devDependencies": {
30-
"angular-mocks": "^1.4.4",
31-
"bootstrap": "^3.3.1",
32-
"jquery": "^2.1.3"
30+
"angular-mocks": "^1.4.7",
31+
"bootstrap": "^3.3.5",
32+
"jquery": "^2.1.4"
3333
}
3434
}

‎demo/index.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
<meta name="msapplication-TileImage" content="/mstile-144x144.png">
3232
<meta name="theme-color" content="#ffffff">
3333

34-
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css">
34+
<link rel="stylesheet" href="node_modules/bootstrap/dist/css/bootstrap.css">
3535
<link rel="stylesheet" href="src/css/datetimepicker.css">
36-
<script type="text/javascript" src="bower_components/jquery/dist/jquery.js"></script>
37-
<script type="text/javascript" src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
38-
<script type="text/javascript" src="bower_components/angular/angular.js"></script>
39-
<script type="text/javascript" src="bower_components/moment/moment.js"></script>
40-
<script type="text/javascript" src="bower_components/moment/locale/de.js"></script>
41-
<script type="text/javascript" src="bower_components/moment/locale/zh-cn.js"></script>
36+
<script type="text/javascript" src="node_modules/jquery/dist/jquery.js"></script>
37+
<script type="text/javascript" src="node_modules/bootstrap/dist/js/bootstrap.js"></script>
38+
<script type="text/javascript" src="node_modules/angular/angular.js"></script>
39+
<script type="text/javascript" src="node_modules/moment/moment.js"></script>
40+
<script type="text/javascript" src="node_modules/moment/locale/de.js"></script>
41+
<script type="text/javascript" src="node_modules/moment/locale/zh-cn.js"></script>
4242
<script type="text/javascript" src="demo/demo-app.js"></script>
4343
<script type="text/javascript" src="demo/demo-controller.js"></script>
4444
<script type="text/javascript" src="src/js/datetimepicker.js"></script>

‎karma.conf.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ module.exports = function (config) {
5656
// the configure thresholds
5757
thresholdReporter: {
5858
statements: 100,
59-
branches: 96.9,
59+
branches: 97,
6060
functions: 100,
6161
lines: 100
6262
},

‎package.json‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,40 @@
1010
"homepage": "http://dalelotts.github.io/angular-bootstrap-datetimepicker",
1111
"main": "src/js/datetimepicker.js",
1212
"dependencies": {
13-
"angular": "^1.4.4",
13+
"angular": "^1.4.7",
1414
"moment": "^2.10.6"
1515
},
1616
"devDependencies": {
17+
"angular-mocks": "^1.4.7",
18+
"bootstrap": "^3.3.5",
1719
"bower": "latest",
1820
"csslint": "^0.10.0",
1921
"grunt": "^0.4.4",
20-
"grunt-bump": "^0.3.2",
22+
"grunt-bump": "^0.6.0",
2123
"gulp": "^3.8.11",
2224
"gulp-csslint": "^0.2.0",
23-
"gulp-jscs": "^2.0.0",
25+
"gulp-jscs": "^3.0.0",
2426
"gulp-jshint": "^1.11.2",
27+
"jquery": "^2.1.4",
2528
"jshint": "^2.6.0",
2629
"jshint-stylish": "^2.0.1",
27-
"karma": "^0.13.9",
30+
"karma": "^0.13.10",
2831
"karma-chrome-launcher": "^0.2.0",
2932
"karma-coverage": "^0.5.0",
3033
"karma-firefox-launcher": "^0.1.3",
3134
"karma-jasmine": "^0.3.6",
3235
"karma-phantomjs-launcher": "^0.2.1",
3336
"karma-threshold-reporter": "^0.1.12",
3437
"lodash": "^3.10.1",
35-
"matchdep": "^0.3.0",
38+
"matchdep": "^1.0.0",
3639
"phantomjs": "^1.9.18",
3740
"plato": "^1.5.0",
3841
"run-browser": "^2.0.2",
3942
"tape": "^4.2.0"
4043
},
4144
"scripts": {
4245
"test": "npm run test-browserify && gulp",
43-
"test-browserify": "run-browser test/commonjs/browserify.test.js -b",
44-
"postinstall": "bower install"
46+
"test-browserify": "run-browser test/commonjs/browserify.test.js -b"
4547
},
4648
"repository": {
4749
"type": "git",

‎paths.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/* jshint node:true */
22

3-
var bower = [
4-
'bower_components/jquery/dist/jquery.js',
5-
'bower_components/moment/moment.js',
6-
'bower_components/moment/locale/*.js',
7-
'bower_components/bootstrap/dist/js/bootstrap.js',
8-
'bower_components/angular/angular.js',
9-
'bower_components/angular-mocks/angular-mocks.js'
3+
var modules = [
4+
'node_modules/jquery/dist/jquery.js',
5+
'node_modules/moment/moment.js',
6+
'node_modules/moment/locale/*.js',
7+
'node_modules/bootstrap/dist/js/bootstrap.js',
8+
'node_modules/angular/angular.js',
9+
'node_modules/angular-mocks/angular-mocks.js'
1010
];
1111
var bumpFiles = ['package.json', 'bower.json', 'README.md', 'src/js/*.js'];
1212
var cssFiles = ['src/css/*.css'];
@@ -16,7 +16,7 @@ var sourceFiles = ['src/**/*.js'];
1616
var testFiles = ['test/**/*.spec.js'];
1717

1818
module.exports = {
19-
all: bower.concat(sourceFiles).concat(testFiles).concat(demoFiles),
19+
all: modules.concat(sourceFiles).concat(testFiles).concat(demoFiles),
2020
app: sourceFiles,
2121
bump: bumpFiles.concat(cssFiles),
2222
css: cssFiles,

‎test/commonjs/browserify.test.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,7 @@ tapeTest('package and bower dependencies & version match', function (t) {
3333
t.equal(packageFile.dependencies.angular, bowerFile.dependencies.angular, 'Angular mismatch');
3434
t.equal(packageFile.dependencies.angular, bowerFile.devDependencies['angular-mocks'], 'Angular mocks mismatch');
3535
t.equal(packageFile.dependencies.moment, bowerFile.dependencies.moment, 'moment mismatch');
36+
t.equal(packageFile.devDependencies.bootstrap, bowerFile.devDependencies.bootstrap, 'bootstrap mismatch');
37+
t.equal(packageFile.devDependencies.jquery, bowerFile.devDependencies.jquery, 'jquery mismatch');
3638
t.end();
3739
});

‎test/configuration/dropdownSelector.spec.js‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*globals describe, beforeEach, it, expect, module, inject, jQuery */
1+
/*globals describe, beforeEach, it, expect, module, inject, jQuery, moment */
22

33
/**
44
* @license angular-bootstrap-datetimepicker
@@ -45,6 +45,39 @@ describe('dropdownSelector', function () {
4545
pastElement.trigger('click');
4646
expect($rootScope.date).not.toEqual(null);
4747
});
48+
it('and calls bootstrap methods', function () {
49+
50+
var html = '<div class="dropdown">' +
51+
'<a class="dropdown-toggle" id="dropdown" role="button" data-toggle="dropdown" data-target="#" href="#">' +
52+
' <div class="input-group">' +
53+
' <input type="text" class="form-control" data-ng-model="data.dateDropDownInputNoFormatting">' +
54+
' <span class="input-group-addon"><i class="glyphicon glyphicon-calendar"></i></span>' +
55+
' </div>' +
56+
'</a>' +
57+
'<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">' +
58+
' <datetimepicker data-ng-model="date" data-datetimepicker-config="{ startView: \'year\', minView: \'year\', dropdownSelector: \'#dropdown\' }"></datetimepicker>' +
59+
'</ul>' +
60+
'</div>';
61+
62+
var element = $compile(html)($rootScope);
63+
$rootScope.$digest();
64+
65+
expect($rootScope.date).toEqual(null);
66+
67+
var dropdownLink = jQuery('#dropdown', element);
68+
var parent = dropdownLink.parent('div.dropdown');
69+
expect(parent.hasClass('open')).toBeFalsy();
70+
71+
dropdownLink.dropdown().trigger('click');
72+
expect(parent.hasClass('open')).toBeTruthy();
73+
74+
var pastElement = jQuery('.past', element);
75+
pastElement.trigger('click');
76+
77+
expect($rootScope.date).toEqual(moment('2009-01-01T00:00:00.000').toDate());
78+
// ToDo: The open class should be removed after click. For some reason it is not.
79+
// expect(parent.hasClass('open')).toBeFalsy(); // Always truthy for some reason.
80+
});
4881
});
4982
});
5083

0 commit comments

Comments
 (0)