solitaire-javascript project updated

.gitignore

+solitaire-javascript/node_modules

solitaire-javascript/.gitignore

@@ -4,6 +4,7 @@ node_modules/
 bower_components/
 tmp
 .DS_Store
+test-results/
 
 ## Directory-based project format:
 .idea/

solitaire-javascript/.goutputstream-6N0NE0

+{
+  "name": "solitaire",
+  "private": true,
+  "version": "0.0.0",
+  "description": "A game of solitaire",
+  "repository": "https://github.com/g0t4/angular-solitaire",
+  "license": "MIT",
+  "dependencies": {},
+  "devDependencies": {
+    "bower": "^1.3.1",
+    "eslint": "^1.5.1",
+    "http-server": "^0.8.4",
+    "jasmine-core": "^2.3.4",
+    "karma": "~0.13",
+    "karma-chrome-launcher": "^0.2.0",
+    "karma-firefox-launcher": "^0.1.6",
+    "karma-jasmine": "^0.3.6",
+    "karma-junit-reporter": "^0.3.8",
+    "karma-phantomjs-launcher": "^1.0.1",
+    "karma-safari-launcher": "^1.0.0"
+  },
+  "scripts": {
+    "postinstall": "node node_modules/bower/bin/bower install",
+    "prestart": "npm install",
+    "start": "http-server -c-1 -o",
+    "pretest": "npm install",
+    "test": "karma start karma.conf.js",
+    "test-single-run": "karma start karma.conf.js --single-run",
+    "test-chrome": "karma start karma.conf.js --single-run --browsers Chrome"
+  }
+}

solitaire-javascript/Dockerfile

+FROM nginx:1.10.1-alpine
+
+ADD app/ /usr/share/nginx/html
\ No newline at end of file

solitaire-javascript/docker-compose.yml

+version: '2'
+
+services:
+  solitaire:
+    build: .
+    ports:
+      - 3000:80

solitaire-javascript/karma.conf.js

@@ -27,16 +27,20 @@ module.exports = function (config) {
 
     browsers: ["Chrome", "Firefox"],
 
+    reporters: ['progress', 'junit'],
+
     plugins: [
       "karma-chrome-launcher",
       "karma-firefox-launcher",
       "karma-jasmine",
-      "karma-junit-reporter"
+      "karma-junit-reporter",
+      "karma-phantomjs-launcher",
+      "karma-safari-launcher"
     ],
 
     junitReporter: {
-      outputFile: "test_out/unit.xml",
-      suite: "unit"
+      outputFile: "test-results.xml",
+      outputDir: "test-results"
     }
 
   });

solitaire-javascript/package.json

@@ -15,7 +15,9 @@
     "karma-chrome-launcher": "^0.2.0",
     "karma-firefox-launcher": "^0.1.6",
     "karma-jasmine": "^0.3.6",
-    "karma-junit-reporter": "^0.3.4"
+    "karma-junit-reporter": "^0.3.8",
+    "karma-phantomjs-launcher": "^1.0.1",
+    "karma-safari-launcher": "^1.0.0"
   },
   "scripts": {
     "postinstall": "node node_modules/bower/bin/bower install",
@@ -23,6 +25,7 @@
     "start": "http-server -c-1 -o",
     "pretest": "npm install",
     "test": "karma start karma.conf.js",
-    "test-single-run": "karma start karma.conf.js --single-run"
+    "test-single-run": "karma start karma.conf.js --single-run",
+    "test-chrome": "karma start karma.conf.js --single-run --browsers Chrome"
   }
 }

solitaire-javascript/package.json~

+{
+  "name": "solitaire",
+  "private": true,
+  "version": "0.0.0",
+  "description": "A game of solitaire",
+  "repository": "https://github.com/g0t4/angular-solitaire",
+  "license": "MIT",
+  "dependencies": {},
+  "devDependencies": {
+    "bower": "^1.3.1",
+    "eslint": "^1.5.1",
+    "http-server": "^0.8.4",
+    "jasmine-core": "^2.3.4",
+    "karma": "~0.13",
+    "karma-chrome-launcher": "^0.2.0",
+    "karma-firefox-launcher": "^0.1.6",
+    "karma-jasmine": "^0.3.6",
+    "karma-junit-reporter": "^0.3.8",
+    "karma-phantomjs-launcher": "^1.0.1",
+    "karma-safari-launcher": "^1.0.0"
+  },
+  "scripts": {
+    "postinstall": "node node_modules/bower/bin/bower install",
+    "prestart": "npm install",
+    "start": "http-server -c-1 -o",
+    "pretest": "npm install",
+    "test": "karma start karma.conf.js",
+    "test-single-run": "karma start karma.conf.js --single-run",
+    "test-chrome": "karma start karma.conf.js --single-run --browsers Chrome"
+  }
+}