Skip to content

Commit

Permalink
upgrade: angular to v1.6.1; angular-ui-bootstrap to v2.5.0
Browse files Browse the repository at this point in the history
Other packages upgraded:
- angular-moment to v1.0.0
- angular-ui-router to v0.4.2
- angular-mocks to v1.6.1

Change-type: patch
Changelog-Entry: Fix duplicate error messages
Fixes: #1082
  • Loading branch information
stefan-mihaila committed Feb 4, 2017
1 parent ea95177 commit 11528e7
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 22 deletions.
5 changes: 5 additions & 0 deletions lib/gui/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,11 @@ app.config(($provide) => {
});
});

app.config(($qProvider) => {
// Prevent errors generated by $uibModalInstance.dismiss() unhandled rejections
$qProvider.errorOnUnhandledRejections(false);
});

app.controller('HeaderController', function(SelectionStateModel, OSOpenExternalService) {

/**
Expand Down
24 changes: 12 additions & 12 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@
"removedrive": "^1.1.1"
},
"dependencies": {
"angular": "^1.5.3",
"angular": "^1.6.1",
"angular-if-state": "^1.0.0",
"angular-middle-ellipses": "^1.0.0",
"angular-moment": "^1.0.0-beta.6",
"angular-moment": "^1.0.0",
"angular-seconds-to-date": "^1.0.0",
"angular-ui-bootstrap": "^1.3.2",
"angular-ui-router": "^0.2.18",
"angular-ui-bootstrap": "^2.5.0",
"angular-ui-router": "^0.4.2",
"archive-type": "^3.2.0",
"bluebird": "^3.0.5",
"bootstrap-sass": "^3.3.5",
Expand Down Expand Up @@ -102,7 +102,7 @@
"yauzl": "^2.6.0"
},
"devDependencies": {
"angular-mocks": "^1.4.7",
"angular-mocks": "^1.6.1",
"browserify": "^13.0.1",
"cz-conventional-changelog": "^1.1.6",
"electron-builder": "^2.6.0",
Expand Down
10 changes: 5 additions & 5 deletions tests/gui/modules/image-writer.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('Browser: ImageWriter', function() {

describe('.flash()', function() {

describe('given a succesful write', function() {
describe('given a successful write', function() {

beforeEach(function() {
this.performWriteStub = m.sinon.stub(ImageWriterService, 'performWrite');
Expand Down Expand Up @@ -62,7 +62,7 @@ describe('Browser: ImageWriter', function() {
});

ImageWriterService.flash('foo.img', '/dev/disk2');
ImageWriterService.flash('foo.img', '/dev/disk2');
ImageWriterService.flash('foo.img', '/dev/disk2').catch(angular.noop);
$rootScope.$apply();
m.chai.expect(this.performWriteStub).to.have.been.calledOnce;
});
Expand All @@ -83,7 +83,7 @@ describe('Browser: ImageWriter', function() {

});

describe('given an unsuccesful write', function() {
describe('given an unsuccessful write', function() {

beforeEach(function() {
this.performWriteStub = m.sinon.stub(ImageWriterService, 'performWrite');
Expand All @@ -97,13 +97,13 @@ describe('Browser: ImageWriter', function() {
});

it('should set flashing to false when done', function() {
ImageWriterService.flash('foo.img', '/dev/disk2');
ImageWriterService.flash('foo.img', '/dev/disk2').catch(angular.noop);
$rootScope.$apply();
m.chai.expect(FlashStateModel.isFlashing()).to.be.false;
});

it('should set the error code in the flash results', function() {
ImageWriterService.flash('foo.img', '/dev/disk2');
ImageWriterService.flash('foo.img', '/dev/disk2').catch(angular.noop);
$rootScope.$apply();
const flashResults = FlashStateModel.getFlashResults();
m.chai.expect(flashResults.errorCode).to.equal('FOO');
Expand Down

0 comments on commit 11528e7

Please sign in to comment.