Merge pull request samvloeberghs#34 from samvloeberghs/electron

upgraded angularjs + added electron

Author: samvloeberghs

config/protractor.electron.conf.js

@@ -0,0 +1,52 @@
+dirname = __dirname;
+require('ts-node/register');
+var helpers = require('./helpers');
+
+console.log("dirname");
+console.log(dirname);
+
+exports.config = {
+
+
+  /**
+   * Angular 2 configuration
+   *
+   * useAllAngular2AppRoots: tells Protractor to wait for any angular2 apps on the page instead of just the one matching
+   * `rootEl`
+   *
+   */
+  useAllAngular2AppRoots: true,
+
+  baseUrl: 'http://localhost:3000',
+
+  allScriptsTimeout: 110000,
+
+  framework: 'custom',
+  frameworkPath: require.resolve('protractor-cucumber-framework'),
+  specs: [
+    helpers.root('test/e2e/**/*.feature')
+  ],
+  cucumberOpts: {
+    require: [
+      'test/e2e/**/*.steps.ts'
+    ],
+    format: 'pretty'
+  },
+
+  directConnect: true,
+
+  // THIS IS platform specific!!
+  // Change the binary to where your electron is
+  capabilities: {
+    'browserName': 'chrome',
+    'chromeOptions': {
+      'binary': '/Users/samvloeberghs/.nvm/versions/node/v6.2.2/lib/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron',
+      'args': ['app=.']
+    }
+  },
+
+  onPrepare: function () {
+    browser.ignoreSynchronization = true;
+  }
+
+};

main.js

@@ -0,0 +1,52 @@
+const electron = require('electron');
+// Module to control application life.
+const app = electron.app;
+// Module to create native browser window.
+const BrowserWindow = electron.BrowserWindow;
+
+// Keep a global reference of the window object, if you don't, the window will
+// be closed automatically when the JavaScript object is garbage collected.
+let mainWindow;
+
+function createWindow () {
+  // Create the browser window.
+  mainWindow = new BrowserWindow({width: 1200, height: 500});
+
+  // and load the index.html of the app.
+  mainWindow.loadURL('http://localhost:3000');
+
+  // Open the DevTools.
+  // mainWindow.webContents.openDevTools({mode: 'detach'});
+
+  // Emitted when the window is closed.
+  mainWindow.on('closed', function () {
+    // Dereference the window object, usually you would store windows
+    // in an array if your app supports multi windows, this is the time
+    // when you should delete the corresponding element.
+    mainWindow = null;
+  })
+}
+
+// This method will be called when Electron has finished
+// initialization and is ready to create browser windows.
+// Some APIs can only be used after this event occurs.
+app.on('ready', createWindow);
+
+// Quit when all windows are closed.
+app.on('window-all-closed', function () {
+  // On OS X it is common for applications and their menu bar
+  // to stay active until the user quits explicitly with Cmd + Q
+  if (process.platform !== 'darwin') {
+    app.quit();
+  }
+});
+
+app.on('activate', function () {
+  // On OS X it's common to re-create a window in the app when the
+  // dock icon is clicked and there are no other windows open.
+  if (mainWindow === null) {
+    createWindow()
+  }
+});
+
+// In this file you can include the rest of your app's specific main process

package.json

@@ -6,6 +6,7 @@
   "contributors": [
     "Dennis Jaamann <dennis@jman-consulting.be>"
   ],
+  "main": "main.js",
   "homepage": "https://github.com/samvloeberghs/protractor-gherkin-cucumberjs-angular2",
   "license": "MIT",
   "scripts": {
@@ -17,6 +18,7 @@
     "webdriver-manager": "webdriver-manager",
     "protractor": "protractor protractor.conf.js",
     "protractor:saucelabs": "protractor protractor.saucelabs.conf.js",
+    "protractor:electron": "protractor protractor.electron.conf.js",
     "clean": "npm cache clean && npm run rimraf -- node_modules doc coverage dist",
     "clean:dist": "npm run rimraf -- dist",
     "preclean:install": "npm run clean",
@@ -43,6 +45,7 @@
     "pree2e": "npm run webdriver:update -- --standalone",
     "e2e": "npm run protractor",
     "e2e:saucelabs": "npm run protractor:saucelabs",
+    "e2e:electron": "npm run protractor:electron",
     "e2e:live": "npm run e2e -- --elementExplorer",
     "test": "node --max-old-space-size=4096 node_modules/karma/bin/karma start",
     "ci": "npm run e2e && npm run test",
@@ -54,14 +57,14 @@
     "postversion": "git push && git push --tags"
   },
   "dependencies": {
-    "@angular/common": "2.0.0",
-    "@angular/compiler": "2.0.0",
-    "@angular/core": "2.0.0",
-    "@angular/forms": "2.0.0",
-    "@angular/http": "2.0.0",
-    "@angular/platform-browser": "2.0.0",
-    "@angular/platform-browser-dynamic": "2.0.0",
-    "@angular/router": "3.0.0",
+    "@angular/common": "2.1.0",
+    "@angular/compiler": "2.1.0",
+    "@angular/core": "2.1.0",
+    "@angular/forms": "2.1.0",
+    "@angular/http": "2.1.0",
+    "@angular/platform-browser": "2.1.0",
+    "@angular/platform-browser-dynamic": "2.1.0",
+    "@angular/router": "3.1.0",
     "core-js": "^2.4.1",
     "jquery": "^2.2.2",
     "lodash": "^4.7.0",
@@ -80,12 +83,15 @@
     "awesome-typescript-loader": "~2.2.1",
     "chai": "^3.5.0",
     "chai-as-promised": "^5.3.0",
-    "codelyzer": "0.0.25",
+    "codelyzer": "1.0.0-beta.2",
     "compression-webpack-plugin": "^0.3.0",
     "copy-webpack-plugin": "^1.1.1",
     "css-loader": "^0.23.1",
     "cucumber": "^1.3.0",
     "cucumber-tsflow": "^1.2.1",
+    "electron": "^1.4.3",
+    "electron-chromedriver": "^1.4.0",
+    "electron-prebuilt": "^1.4.3",
     "exports-loader": "^0.6.3",
     "expose-loader": "^0.7.1",
     "file-loader": "^0.8.5",

protractor.electron.conf.js

@@ -0,0 +1,3 @@
+// @AngularClass
+// look in ./config for protractor.saucelabs.conf.js
+exports.config = require('./config/protractor.electron.conf.js').config;

src/app/app.component.ts

@@ -1,4 +1,4 @@
-import { Component, ViewEncapsulation } from '@angular/core';
+import { Component, ViewEncapsulation, OnInit } from '@angular/core';
 
 import { AppState } from './app.service';
 
@@ -14,7 +14,7 @@ import { AppState } from './app.service';
   encapsulation: ViewEncapsulation.None
 })
 
-export class AppComponent {
+export class AppComponent implements OnInit {
 
   constructor(public appState: AppState) {
   }

tslint.json

@@ -1,70 +1,29 @@
 {
   "rulesDirectory": [
-    "node_modules/codelyzer/dist/src"
+    "node_modules/codelyzer"
   ],
-  "rules": {
+  "rules":{
+    "directive-selector-name": [true, "camelCase"],
     "component-selector-name": [true, "kebab-case"],
+    "directive-selector-type": [true, "attribute"],
     "component-selector-type": [true, "element"],
-    "host-parameter-decorator": true,
-    "input-parameter-decorator": true,
-    "output-parameter-decorator": true,
-    "attribute-parameter-decorator": false,
-    "input-property-directive": true,
-    "output-property-directive": true,
-
-    "class-name": true,
-    "curly": false,
-    "eofline": true,
-    "indent": [
-      true,
-      "spaces"
-    ],
-    "max-line-length": [
-      true,
-      100
-    ],
-    "member-ordering": [
-      true,
-      "public-before-private",
-      "static-before-instance",
-      "variables-before-functions"
-    ],
-    "no-arg": true,
-    "no-construct": true,
-    "no-duplicate-key": true,
-    "no-duplicate-variable": true,
-    "no-empty": false,
-    "no-eval": true,
-    "trailing-comma": true,
-    "no-trailing-whitespace": true,
-    "no-unused-expression": true,
-    "no-unused-variable": false,
-    "no-unreachable": true,
-    "no-use-before-declare": true,
-    "one-line": [
-      true,
-      "check-open-brace",
-      "check-catch",
-      "check-else",
-      "check-whitespace"
-    ],
-    "quotemark": [
-      true,
-      "single"
-    ],
-    "semicolon": true,
-    "triple-equals": [
-      true,
-      "allow-null-check"
-    ],
-    "variable-name": false,
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-operator",
-      "check-separator",
-      "check-type"
-    ]
+    "directive-selector-prefix": [true, "sv"],
+    "component-selector-prefix": [true, "sv"],
+    "use-input-property-decorator": true,
+    "use-output-property-decorator": true,
+    "use-host-property-decorator": true,
+    "no-attribute-parameter-decorator": true,
+    "no-input-rename": true,
+    "no-output-rename": true,
+    "no-forward-ref": true,
+    "use-life-cycle-interface": true,
+    "use-pipe-transform-interface": true,
+    "pipe-naming": [true, "camelCase", "sg"],
+    "component-class-suffix": true,
+    "directive-class-suffix": true,
+    "import-destructuring-spacing": true,
+    "templates-use-public": true,
+    "no-access-missing-member": true,
+    "invoke-injectable": true
   }
 }