Skip to content

Commit

Permalink
fix(picker): Force patch release
Browse files Browse the repository at this point in the history
Update dependencies and fix failing tests that resulted from moment updating the 中文 time format yet

again. 對不起我的中文不好 See https://youtu.be/2XTBwvi0h2E

Fix #338
  • Loading branch information
dalelotts committed Mar 31, 2017
1 parent f1812ca commit 2bd7d91
Show file tree
Hide file tree
Showing 16 changed files with 37 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "stylelint-config-standard",
"rules": {
"rule-non-nested-empty-line-before": "never"
"rule-empty-line-before": "never"
}
}
1 change: 0 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,3 @@ function testConfig (options) {

return lodash.assign(options, travisOptions)
}

58 changes: 29 additions & 29 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,58 +22,58 @@
"style": "src/css/datetimepicker.css",
"scss": "src/scss/datetimepicker.scss",
"dependencies": {
"angular": "^1.5.8",
"moment": "^2.16.0"
"angular": "^1.6.3",
"moment": "^2.18.1"
},
"devDependencies": {
"angular-date-time-input": "^1.2.1",
"angular-mocks": "^1.5.8",
"autoprefixer": "^6.5.3",
"angular-mocks": "^1.6.3",
"autoprefixer": "^6.7.7",
"bootstrap": "^3.3.7",
"commitizen": "^2.8.6",
"coveralls": "^2.11.14",
"csscomb": "^3.1.8",
"csslint": "^1.0.4",
"cz-conventional-changelog": "^1.2.0",
"commitizen": "^2.9.6",
"coveralls": "^2.13.0",
"csscomb": "^4.0.1",
"csslint": "^1.0.5",
"cz-conventional-changelog": "^2.0.0",
"del": "^2.2.2",
"eslint": "^3.9.1",
"eslint": "^3.18.0",
"gulp": "^3.9.1",
"gulp-angular-templatecache": "^2.0.0",
"gulp-csscomb": "^3.0.8",
"gulp-csslint": "^1.0.0",
"gulp-htmlmin": "^3.0.0",
"gulp-jscs": "^4.0.0",
"gulp-jshint": "^2.0.2",
"gulp-postcss": "^6.2.0",
"gulp-sass": "^2.3.2",
"gulp-jshint": "^2.0.4",
"gulp-postcss": "^6.4.0",
"gulp-sass": "^3.1.0",
"gulp-scss-lint": "^0.4.0",
"gulp-scss-lint-stylish": "^1.0.1",
"gulp-sourcemaps": "^2.2.0",
"gulp-standard": "^8.0.2",
"gulp-stylelint": "^3.4.0",
"gulp-sourcemaps": "^2.5.0",
"gulp-standard": "^9.0.0",
"gulp-stylelint": "^3.9.0",
"jasmine-core": "^2.5.2",
"jquery": "^2.2.4",
"jshint": "^2.9.4",
"jshint-stylish": "^2.2.1",
"karma": "^1.3.0",
"karma": "^1.5.0",
"karma-chrome-launcher": "^2.0.0",
"karma-coverage": "^1.1.1",
"karma-firefox-launcher": "^1.0.0",
"karma-jasmine": "^1.0.2",
"karma-phantomjs-launcher": "^1.0.2",
"karma-firefox-launcher": "^1.0.1",
"karma-jasmine": "^1.1.0",
"karma-phantomjs-launcher": "^1.0.4",
"karma-threshold-reporter": "^0.1.15",
"karma-webpack": "^1.8.0",
"lodash": "^4.16.6",
"karma-webpack": "^2.0.3",
"lodash": "^4.17.4",
"matchdep": "^1.0.1",
"moment-timezone": "^0.5.9",
"phantomjs-prebuilt": "^2.1.13",
"moment-timezone": "^0.5.11",
"phantomjs-prebuilt": "^2.1.14",
"plato": "^1.7.0",
"run-browser": "^2.0.2",
"semantic-release": "^6.3.0",
"standard": "^8.5.0",
"stylelint-config-standard": "^14.0.0",
"tape": "^4.6.2",
"webpack": "^1.13.3"
"semantic-release": "^6.3.2",
"standard": "^9.0.2",
"stylelint-config-standard": "^16.0.0",
"tape": "^4.6.3",
"webpack": "^2.3.2"
},
"scripts": {
"coverage:upload": "cat build/coverage/lcov.info | coveralls",
Expand Down
1 change: 0 additions & 1 deletion test/configuration/beforeRender.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,3 @@ describe('beforeRender', function () {
})
})
})

1 change: 0 additions & 1 deletion test/configuration/configurationValidation.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,3 @@ describe('configuration validation', function () {
})
})
})

1 change: 0 additions & 1 deletion test/configuration/configureOn.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,3 @@ describe('configureOn', function () {
})
})
})

1 change: 0 additions & 1 deletion test/configuration/dropdownSelector.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,3 @@ describe('dropdownSelector', function () {
})
})
})

1 change: 0 additions & 1 deletion test/configuration/minView.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,3 @@ describe('minView', function () {
})
})
})

1 change: 0 additions & 1 deletion test/configuration/minuteStep.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,3 @@ describe('minuteStep', function () {
})
})
})

1 change: 0 additions & 1 deletion test/configuration/onSetTime.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,3 @@ describe('onSetTime', function () {
})
})
})

1 change: 0 additions & 1 deletion test/configuration/renderOn.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,3 @@ describe('renderOn', function () {
})
})
})

1 change: 0 additions & 1 deletion test/configuration/startView.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,3 @@ describe('startView', function () {
})
})
})

1 change: 0 additions & 1 deletion test/model/modelType.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -325,4 +325,3 @@ describe('modelType', function () {
})
})
})

1 change: 0 additions & 1 deletion test/view/css.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,3 @@ describe('css styling', function () {
angular.element(document).find('body').remove('.datetimepicker')
})
})

2 changes: 1 addition & 1 deletion test/view/zh_cn/hour.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ describe('hour view with initial date of "2020-01-01T00:00:00.000", minView="hou
var selectedElement = jQuery(jQuery('.hour', element)[3])
selectedElement.trigger('click')

expect(jQuery('.active', element).text()).toBe('凌晨3点00分')
expect(jQuery('.active', element).text()).toBe('03:00')
expect(rootScope.date).toEqual(moment('2020-01-01T03:00:00.000').toDate())
})
})
12 changes: 6 additions & 6 deletions test/view/zh_cn/minute.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('minute view with initial date of 2013-01-22 0:00', function () {
$rootScope.$digest()
}))
it('has `.switch` element with a value of 2013-Jan-22 0:00', function () {
expect(jQuery('.switch', element).text()).toBe('2013年1月22日凌晨12点00分')
expect(jQuery('.switch', element).text()).toBe('2013年1月22日 00:00')
})
it('has 12 `.minute` elements', function () {
expect(jQuery('.minute', element).length).toBe(12)
Expand All @@ -48,7 +48,7 @@ describe('minute view with initial date of 2013-01-22 0:00', function () {
expect(jQuery('.active', element).length).toBe(1)
})
it('`.active` element with a value of 0:00', function () {
expect(jQuery('.active', element).text()).toBe('凌晨12点00分')
expect(jQuery('.active', element).text()).toBe('00:00')
})
it('has a `<th class=`left`>` that contains a sr description set in simplified chinese', function () {
expect(jQuery('th[class*=left] .sr-only', element).text()).toBe('上一页')
Expand All @@ -70,21 +70,21 @@ describe('minute view with initial date of 2013-01-22 1:15', function () {
$rootScope.$digest()
}))
it('has `.switch` element with a value of 2013-Jan-22 1:00', function () {
expect(jQuery('.switch', element).text()).toBe('2013年1月22日凌晨1点00分')
expect(jQuery('.switch', element).text()).toBe('2013年1月22日 01:00')
})
it('has 4 `.minute` elements', function () {
expect(jQuery('.minute', element).length).toBe(4)
})
it('has 1 `.active` element with a value of 1:15', function () {
expect(jQuery('.active', element).text()).toBe('凌晨1点15分')
expect(jQuery('.active', element).text()).toBe('01:15')
})
it('changes date/time to 1:00 to when clicking first `.minute` element with a value of 0:00', function () {
expect(jQuery('.active', element).text()).toBe('凌晨1点15分')
expect(jQuery('.active', element).text()).toBe('01:15')

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

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

0 comments on commit 2bd7d91

Please sign in to comment.