Skip to content

Commit 2bd7d91

Browse files
committed
fix(picker): Force patch release
Update dependencies and fix failing tests that resulted from moment updating the 中文 time format yet again. 對不起我的中文不好 See https://youtu.be/2XTBwvi0h2E Fix #338
1 parent f1812ca commit 2bd7d91

16 files changed

+37
-49
lines changed

.stylelintrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"extends": "stylelint-config-standard",
33
"rules": {
4-
"rule-non-nested-empty-line-before": "never"
4+
"rule-empty-line-before": "never"
55
}
66
}

gulpfile.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,3 @@ function testConfig (options) {
123123

124124
return lodash.assign(options, travisOptions)
125125
}
126-

package.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,58 +22,58 @@
2222
"style": "src/css/datetimepicker.css",
2323
"scss": "src/scss/datetimepicker.scss",
2424
"dependencies": {
25-
"angular": "^1.5.8",
26-
"moment": "^2.16.0"
25+
"angular": "^1.6.3",
26+
"moment": "^2.18.1"
2727
},
2828
"devDependencies": {
2929
"angular-date-time-input": "^1.2.1",
30-
"angular-mocks": "^1.5.8",
31-
"autoprefixer": "^6.5.3",
30+
"angular-mocks": "^1.6.3",
31+
"autoprefixer": "^6.7.7",
3232
"bootstrap": "^3.3.7",
33-
"commitizen": "^2.8.6",
34-
"coveralls": "^2.11.14",
35-
"csscomb": "^3.1.8",
36-
"csslint": "^1.0.4",
37-
"cz-conventional-changelog": "^1.2.0",
33+
"commitizen": "^2.9.6",
34+
"coveralls": "^2.13.0",
35+
"csscomb": "^4.0.1",
36+
"csslint": "^1.0.5",
37+
"cz-conventional-changelog": "^2.0.0",
3838
"del": "^2.2.2",
39-
"eslint": "^3.9.1",
39+
"eslint": "^3.18.0",
4040
"gulp": "^3.9.1",
4141
"gulp-angular-templatecache": "^2.0.0",
4242
"gulp-csscomb": "^3.0.8",
4343
"gulp-csslint": "^1.0.0",
4444
"gulp-htmlmin": "^3.0.0",
4545
"gulp-jscs": "^4.0.0",
46-
"gulp-jshint": "^2.0.2",
47-
"gulp-postcss": "^6.2.0",
48-
"gulp-sass": "^2.3.2",
46+
"gulp-jshint": "^2.0.4",
47+
"gulp-postcss": "^6.4.0",
48+
"gulp-sass": "^3.1.0",
4949
"gulp-scss-lint": "^0.4.0",
5050
"gulp-scss-lint-stylish": "^1.0.1",
51-
"gulp-sourcemaps": "^2.2.0",
52-
"gulp-standard": "^8.0.2",
53-
"gulp-stylelint": "^3.4.0",
51+
"gulp-sourcemaps": "^2.5.0",
52+
"gulp-standard": "^9.0.0",
53+
"gulp-stylelint": "^3.9.0",
5454
"jasmine-core": "^2.5.2",
5555
"jquery": "^2.2.4",
5656
"jshint": "^2.9.4",
5757
"jshint-stylish": "^2.2.1",
58-
"karma": "^1.3.0",
58+
"karma": "^1.5.0",
5959
"karma-chrome-launcher": "^2.0.0",
6060
"karma-coverage": "^1.1.1",
61-
"karma-firefox-launcher": "^1.0.0",
62-
"karma-jasmine": "^1.0.2",
63-
"karma-phantomjs-launcher": "^1.0.2",
61+
"karma-firefox-launcher": "^1.0.1",
62+
"karma-jasmine": "^1.1.0",
63+
"karma-phantomjs-launcher": "^1.0.4",
6464
"karma-threshold-reporter": "^0.1.15",
65-
"karma-webpack": "^1.8.0",
66-
"lodash": "^4.16.6",
65+
"karma-webpack": "^2.0.3",
66+
"lodash": "^4.17.4",
6767
"matchdep": "^1.0.1",
68-
"moment-timezone": "^0.5.9",
69-
"phantomjs-prebuilt": "^2.1.13",
68+
"moment-timezone": "^0.5.11",
69+
"phantomjs-prebuilt": "^2.1.14",
7070
"plato": "^1.7.0",
7171
"run-browser": "^2.0.2",
72-
"semantic-release": "^6.3.0",
73-
"standard": "^8.5.0",
74-
"stylelint-config-standard": "^14.0.0",
75-
"tape": "^4.6.2",
76-
"webpack": "^1.13.3"
72+
"semantic-release": "^6.3.2",
73+
"standard": "^9.0.2",
74+
"stylelint-config-standard": "^16.0.0",
75+
"tape": "^4.6.3",
76+
"webpack": "^2.3.2"
7777
},
7878
"scripts": {
7979
"coverage:upload": "cat build/coverage/lcov.info | coveralls",

test/configuration/beforeRender.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,4 +257,3 @@ describe('beforeRender', function () {
257257
})
258258
})
259259
})
260-

test/configuration/configurationValidation.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,3 @@ describe('configuration validation', function () {
5959
})
6060
})
6161
})
62-

test/configuration/configureOn.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,3 @@ describe('configureOn', function () {
6565
})
6666
})
6767
})
68-

test/configuration/dropdownSelector.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,3 @@ describe('dropdownSelector', function () {
113113
})
114114
})
115115
})
116-

test/configuration/minView.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,3 @@ describe('minView', function () {
5656
})
5757
})
5858
})
59-

test/configuration/minuteStep.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,3 @@ describe('minuteStep', function () {
7070
})
7171
})
7272
})
73-

test/configuration/onSetTime.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,3 @@ describe('onSetTime', function () {
7878
})
7979
})
8080
})
81-

test/configuration/renderOn.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,3 @@ describe('renderOn', function () {
7878
})
7979
})
8080
})
81-

test/configuration/startView.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,3 @@ describe('startView', function () {
5656
})
5757
})
5858
})
59-

test/model/modelType.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,4 +325,3 @@ describe('modelType', function () {
325325
})
326326
})
327327
})
328-

test/view/css.spec.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,4 +86,3 @@ describe('css styling', function () {
8686
angular.element(document).find('body').remove('.datetimepicker')
8787
})
8888
})
89-

test/view/zh_cn/hour.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ describe('hour view with initial date of "2020-01-01T00:00:00.000", minView="hou
7777
var selectedElement = jQuery(jQuery('.hour', element)[3])
7878
selectedElement.trigger('click')
7979

80-
expect(jQuery('.active', element).text()).toBe('凌晨3点00分')
80+
expect(jQuery('.active', element).text()).toBe('03:00')
8181
expect(rootScope.date).toEqual(moment('2020-01-01T03:00:00.000').toDate())
8282
})
8383
})

test/view/zh_cn/minute.spec.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('minute view with initial date of 2013-01-22 0:00', function () {
3939
$rootScope.$digest()
4040
}))
4141
it('has `.switch` element with a value of 2013-Jan-22 0:00', function () {
42-
expect(jQuery('.switch', element).text()).toBe('2013年1月22日凌晨12点00分')
42+
expect(jQuery('.switch', element).text()).toBe('2013年1月22日 00:00')
4343
})
4444
it('has 12 `.minute` elements', function () {
4545
expect(jQuery('.minute', element).length).toBe(12)
@@ -48,7 +48,7 @@ describe('minute view with initial date of 2013-01-22 0:00', function () {
4848
expect(jQuery('.active', element).length).toBe(1)
4949
})
5050
it('`.active` element with a value of 0:00', function () {
51-
expect(jQuery('.active', element).text()).toBe('凌晨12点00分')
51+
expect(jQuery('.active', element).text()).toBe('00:00')
5252
})
5353
it('has a `<th class=`left`>` that contains a sr description set in simplified chinese', function () {
5454
expect(jQuery('th[class*=left] .sr-only', element).text()).toBe('上一页')
@@ -70,21 +70,21 @@ describe('minute view with initial date of 2013-01-22 1:15', function () {
7070
$rootScope.$digest()
7171
}))
7272
it('has `.switch` element with a value of 2013-Jan-22 1:00', function () {
73-
expect(jQuery('.switch', element).text()).toBe('2013年1月22日凌晨1点00分')
73+
expect(jQuery('.switch', element).text()).toBe('2013年1月22日 01:00')
7474
})
7575
it('has 4 `.minute` elements', function () {
7676
expect(jQuery('.minute', element).length).toBe(4)
7777
})
7878
it('has 1 `.active` element with a value of 1:15', function () {
79-
expect(jQuery('.active', element).text()).toBe('凌晨1点15分')
79+
expect(jQuery('.active', element).text()).toBe('01:15')
8080
})
8181
it('changes date/time to 1:00 to when clicking first `.minute` element with a value of 0:00', function () {
82-
expect(jQuery('.active', element).text()).toBe('凌晨1点15分')
82+
expect(jQuery('.active', element).text()).toBe('01:15')
8383

8484
var selectedElement = jQuery(jQuery('.minute', element)[0])
8585
selectedElement.trigger('click')
8686

87-
expect(jQuery('.active', element).text()).toBe('凌晨1点00分')
87+
expect(jQuery('.active', element).text()).toBe('01:00')
8888
expect(rootScope.date).toEqual(moment('2013-01-22T01:00:00.000').toDate())
8989
})
9090
})

0 commit comments

Comments
 (0)