Merge pull request #108 from GNS3/update-packages-2

Update packages

package.json

@@ -26,61 +26,61 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^5.2.1",
-    "@angular/cdk": "^5.1.0",
-    "@angular/common": "^5.2.1",
-    "@angular/compiler": "^5.2.1",
-    "@angular/core": "^5.2.1",
-    "@angular/forms": "^5.2.1",
-    "@angular/http": "^5.2.1",
-    "@angular/material": "^5.1.0",
-    "@angular/platform-browser": "^5.2.1",
-    "@angular/platform-browser-dynamic": "^5.2.1",
-    "@angular/router": "^5.2.1",
-    "@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.9",
+    "@angular/animations": "^5.2.9",
+    "@angular/cdk": "^5.2.4",
+    "@angular/common": "^5.2.9",
+    "@angular/compiler": "^5.2.9",
+    "@angular/core": "^5.2.9",
+    "@angular/forms": "^5.2.9",
+    "@angular/http": "^5.2.9",
+    "@angular/material": "^5.2.4",
+    "@angular/platform-browser": "^5.2.9",
+    "@angular/platform-browser-dynamic": "^5.2.9",
+    "@angular/router": "^5.2.9",
+    "@ng-bootstrap/ng-bootstrap": "^2.0.0-alpha.0",
     "angular-persistence": "^1.0.1",
     "angular2-hotkeys": "^2.0.4",
     "angular2-indexeddb": "^1.2.2",
-    "bootstrap": "4.0.0",
-    "core-js": "^2.4.1",
-    "d3-ng2-service": "^1.23.3",
+    "bootstrap": "4.1.0",
+    "core-js": "^2.5.5",
+    "d3-ng2-service": "^2.1.0",
     "electron-settings": "^3.1.4",
     "material-design-icons": "^3.0.1",
     "ngx-electron": "^1.0.4",
-    "npm-check-updates": "^2.13.0",
-    "raven-js": "^3.24.0",
-    "rxjs": "^5.4.1",
+    "npm-check-updates": "^2.14.1",
+    "raven-js": "^3.24.1",
+    "rxjs": "^5.5.9",
     "typeface-roboto": "^0.0.54",
     "yargs": "^11.0.0",
-    "zone.js": "^0.8.20"
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular/cli": "^6.0.0-beta.5",
-    "@angular/compiler-cli": "^5.2.1",
-    "@angular/language-service": "^5.2.1",
-    "@sentry/electron": "^0.4.2",
-    "@types/jasmine": "~2.8.5",
+    "@angular/cli": "^1.7.4",
+    "@angular/compiler-cli": "^5.2.9",
+    "@angular/language-service": "^5.2.9",
+    "@sentry/electron": "^0.5.0",
+    "@types/jasmine": "~2.8.6",
     "@types/jasminewd2": "~2.0.2",
-    "@types/node": "~9.6.0",
-    "codelyzer": "~4.1.0",
+    "@types/node": "~9.6.4",
+    "codelyzer": "~4.2.1",
     "electron": "1.8.4",
-    "electron-builder": "^20.0.4",
-    "jasmine-core": "~2.99.0",
+    "electron-builder": "^20.8.1",
+    "jasmine-core": "~3.1.0",
     "jasmine-spec-reporter": "~4.2.1",
     "jquery": "^3.3.1",
     "karma": "~2.0.0",
     "karma-chrome-launcher": "~2.2.0",
     "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^1.2.1",
+    "karma-coverage-istanbul-reporter": "^1.4.2",
     "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "node-sass": "^4.5.3",
-    "popper.js": "^1.12.3",
-    "protractor": "~5.3.0",
+    "karma-jasmine-html-reporter": "^1.0.0",
+    "node-sass": "^4.8.3",
+    "popper.js": "^1.14.3",
+    "protractor": "~5.3.1",
     "ts-mockito": "^2.3.0",
-    "ts-node": "~5.0.0",
+    "ts-node": "~5.0.1",
     "tslint": "~5.9.1",
-    "typescript": ">=2.4.0 <2.6.0"
+    "typescript": ">=2.4.2 <2.7.0"
   },
   "greenkeeper": {
     "ignore": [

src/app/cartography/shared/tools/selection-tool.spec.ts

@@ -49,7 +49,7 @@ describe('SelectionTool', () => {
 
     it('path should be visible and have parameters', () => {
         expect(path_selection.attr('visibility')).toEqual('visible');
-        expect(path_selection.attr('d')).toEqual('M95,86 l0,0 l0,0 l0,0z');
+        expect(path_selection.attr('d')).toEqual('M92,100 l0,0 l0,0 l0,0z');
     });
   });
 
@@ -60,7 +60,7 @@ describe('SelectionTool', () => {
     });
 
     it('path should have got changed parameters', () => {
-        expect(path_selection.attr('d')).toEqual('M95,86 l200,0 l0,200 l-200,0z');
+        expect(path_selection.attr('d')).toEqual('M92,100 l200,0 l0,200 l-200,0z');
     });
   });
 
@@ -76,7 +76,7 @@ describe('SelectionTool', () => {
     });
 
     it('rectangle should be selected', () => {
-      expect(selected_rectangle).toEqual(new Rectangle(95, 86, 100, 100));
+      expect(selected_rectangle).toEqual(new Rectangle(92, 100, 100, 100));
     });
 
     describe('SelectionTool can deselect after click outside', () => {
@@ -86,7 +86,7 @@ describe('SelectionTool', () => {
       });
 
       it('rectangle should be selected', () => {
-        expect(selected_rectangle).toEqual(new Rectangle(295, 286, 0, 0));
+        expect(selected_rectangle).toEqual(new Rectangle(292, 300, 0, 0));
       });
     });
   });
@@ -99,7 +99,7 @@ describe('SelectionTool', () => {
     });
 
     it('rectangle should be selected', () => {
-      expect(selected_rectangle).toEqual(new Rectangle(95, 86, 100, 100));
+      expect(selected_rectangle).toEqual(new Rectangle(92, 100, 100, 100));
     });
   });
 
@@ -122,7 +122,7 @@ describe('SelectionTool', () => {
     });
 
     it('path should have d adjusted for transformation', () => {
-        expect(path_selection.attr('d')).toEqual('M-5,-14 l0,0 l0,0 l0,0z');
+        expect(path_selection.attr('d')).toEqual('M-8,0 l0,0 l0,0 l0,0z');
     });
   });
 });