Merge pull request #317 from AdTechMedia/stage

Stage to master 2017-08-08

.codeclimate.yml

@@ -28,31 +28,14 @@ exclude_paths:
  - '**/tests'
  - '**/tmp'
  - '**/vendor'
- - '**/aws-262'
  - '**/.idea'
- - '**/assets'
- - '**/frontend/nytimes'
- - '**/frontend/bloomberg'
- - '**/frontend/wapost'
+ - '**/frontend/demo-pages'
  - '**/frontend/_build'
- - '**/frontend/js'
- - '**/atm-build'
  - '**.spec.js'
  - '**.min.js'
  - '**.min.css'
  - '**/dist'
  - '**/node_modules'
  - '**/packages'
- - '**/font-awesome.css'
- - '**/materialdesignicons.css'
- - '**/DeepFramework.js'
- - '**/deep-framework.js'
- - '**/src/deep-root-*'
- - '**/carousel.js'
- - '**/contact.js'
- - '**/gtm.js'
- - '**/jquery.js'
- - '**/jquery.noty.packaged.js'
- - '**/jquery.vide.js'
- - '**/input-mask.js'
- - '**/sw.js'
+ - '**/frontend/css/vendor'
+ - '**/frontend/js/vendor'

.eslintignore

@@ -8,7 +8,6 @@ tmp/**/*
 **.min.css
 **.css
 docs/
-src/**/frontend/js/app/angular/components/shared/
 
 # third party css files
 **/font-awesome.css
@@ -39,7 +38,6 @@ deep-framework.js
 **/reports
 
 # Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git-
 **/node_modules
 
 # Debug log from npm
@@ -66,27 +64,17 @@ deeploy.*.json
 
 # Frontend dependencies
 **/frontend/_build/
+**/frontend/js/vendor/
 
 # Jspm config file
 config.core.js
 config.system.js
 config.test.js
 
 # Custom ignore file
-**/assets
-**/www.washingtonpost*
-**/www.bloomberg*
-**/www.nytimes*
-**/wapost*
-**/bloomberg*
-**/nytimes*
-**/atm-build
+**/demo-pages/
 **/src/**/backend/vendor
-**/aws-262
 **/_build/
 
 #####=== DEEP ===#####
 **/src/deep-root-*
-
-/src/adtechmedia-website/frontend/js/
-/src/adtechmedia-website/frontend/sw.js

.eslintrc

@@ -1,12 +1,3 @@
-eslintConfig:
- root: true
-ecmaFeatures:
- modules: true
- jsx: true
- arrowFunctions: true
- blockBindings: true
- classes: true
- defaultParams: true
 env:
  amd: true
  browser: true
@@ -17,6 +8,8 @@ env:
  mocha: true
 parserOptions:
  sourceType: module
+ ecmaFeatures:
+ jsx: true
 rules:
  comma-dangle:
  - 0

.gitignore

@@ -1,6 +1,5 @@
 # Logs
 logs
-npm-debug.log*
 
 # Runtime data
 pids
@@ -10,42 +9,30 @@ pids
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
-# Coverage directory used by tools like istanbul
-coverage.*
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+# Grunt intermediate storage
 .grunt
 
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
+# Compiled binary addons
 build/Release
 
 # Dependency directories
 node_modules
 jspm_packages
 
-# Optional npm cache directory
+# npm related
 .npm
+npm-debug.log*
+npm_lazy.log
+npm_lazy.config.js
 
-# Optional REPL history
-.node_repl_history
-
-## Directory-based project format:
+# Directory-based project format:
 .idea/
 
-#####=== DEEP ===#####
-**/src/deep-root-*
-
 # App specific files
 src/adtechmedia-website/.parameters.json
-src/adtechmedia-website/frontend/files/swagger.json
-src/adtechmedia-website/frontend/sw.js
-src/adtechmedia-website/frontend/static-pages/robots.txt
 deeploy.json*
 *_config.json*
 *.provisioning.json*
@@ -58,7 +45,10 @@ deeploy.json*
 
 # Frontend dependencies
 **/js/vendor/
-src/adtechmedia-website/frontend/_build/
+src/adtechmedia-website/frontend/_build/*
+!src/adtechmedia-website/frontend/_build/videos
+!src/adtechmedia-website/frontend/js/vendor
+!src/adtechmedia-website/frontend/css/vendor
 
 # Tests resources
 GitDiffWalker.js
@@ -68,6 +58,5 @@ CoverageManager.js
 GitHubMsgPublisher.js
 _vars.sh
 **/.sass-cache/
-**/coverage/
 **/coverages/
 **/.DS_Store

.recink.yml

@@ -1,4 +1,4 @@
---- 
+---
 $:
  preprocess:
  '$.coverage.compare.storage.options.1.region': 'eval'
@@ -9,6 +9,8 @@ $:
  '$.cache.options.1.secretAccessKey': 'eval'
  '$.codeclimate.token': 'eval'
  '$.snyk.token': 'eval'
+# '$.e2e.wait.uri.0': 'eval'
+ '$.pagespeed.uri': 'eval'
  cache:
  driver: 's3'
  options:
@@ -18,14 +20,15 @@ $:
  accessKeyId: 'process.env.AWS_ACCESS_KEY_ID'
  secretAccessKey: 'process.env.AWS_SECRET_ACCESS_KEY'
  npm:
- scripts:
- - 'compile-travis'
+ scripts: []
+ # - 'compile-travis'
  dependencies:
- chai: 'latest'
+ # chai: 'latest'
+ chance: 'latest'
  emit:
  pattern:
  - /^src.es6\/lib\/.+\.js$/i
- - /^test\/.+\.js$/i
+ - /^tests?\/.+\.js$/i
  ignore:
  - /^(.*\/)?node_modules(\/?$)?/i
  - /^(.*\/)?vendor(\/?$)?/i
@@ -37,17 +40,34 @@ $:
  pattern:
  - /.+\.spec\.js$/i
  ignore: ~
+ e2e:
+ pattern:
+ - /.+\.e2e\.js$/i # Files to include
+ ignore:
+ - assert-social-links.e2e.js
+ browsers: # Browsers to run the tests against
+ - nightmare
+ # - firefox
+ # - chrome
+ wait:
+ interval: 500 # Interval of running uri checks
+ timeout: 60000 # Timeout to wait for uri's available
+ uri: # uri's to wait before start running test cases
+ - 'process.env.DEPLOY_HOST'
  coverage:
  pattern:
  - /.+\.js$/i
  ignore:
+ - /.+\.cfg\.js$/i
+ - /.+\.po\.js$/i
+ - /.+\.e2e\.js$/i
  - /.+\.spec\.js$/i
  - /^(.*\/)?node_modules(\/?$)?/i
  reporters:
  text-summary: ~
  compare:
  negative-delta: 1
- storage: 
+ storage:
  driver: 's3'
  options:
  - 's3://travis-metadata/coverage/AdTechMedia/adtechmedia-website'
@@ -59,7 +79,12 @@ $:
  token: 'process.env.CODECLIMATE_REPO_TOKEN'
  snyk:
  token: 'process.env.SNYK_API_TOKEN'
+ pagespeed:
+ uri: |
+ ['challenges', 'solutions', 'api', 'team', 'contact'].map(item => `${process.env.DEPLOY_HOST}/${item}`)
 
 ### Add other modules here...
-email-send:
- root: src/adtechmedia-website/backend/src/email/send
+#email-send:
+# root: src/adtechmedia-website/backend/src/email/send
+#website:
+# root: test/e2e

.travis.yml

@@ -1,5 +1,4 @@
 language: node_js
-sudo: required
 git:
  depth: 1
 cache:
@@ -28,17 +27,46 @@ env:
  # CODECLIMATE_REPO_TOKEN=[secure]
  - secure: "QONsxWDu0hlTbrTdM2u1ay2tKsIesz56UKjwNanSD3TyBkAvib2w/BZXZL2QuLkNm4nUYrWGrxDNDn4EQbfNKOvo3d3IUI0W+ZDwrKAGKVa8SOXCiXCuh5gXJnbkuLBAS3Mj+EznZ/GCNieWw+4N3iAjXwUJiaAFvyC1hzNsY3Sh+vDJjjmqJZC63kc8rfO+aWb0oRm1m7rnd6weHJBw8F6M2u4DS9N+zCu1UcOufzalcjh3+8isgwkbHVLVDOtNPdGI/Kv6J+kL66K1yhWlKWlV4IfEoOM4iYpo9vYafeLROLOcTnTHFJ7glZM2HU+83mfSu1RvWwUPVz05o0bF6nkM2Fy+Go+qmQHf7AJ2o3/POVNPpQheCDLDOYyc40jmFdGG8vlXs7Yz88j+Z2u3OD+SY9X33lMQooZnWW8ZkTqOsmhhuCOFjAn3Yk33AfTETn/AOyCfyk2zEQQNWS98IiJGFYfN11JV2lvdmLnZYtVSfwl2Ni752oZB7pHUeOaLcCNtxQiJ9aEHKbSJ0DwJYqD0LBasjQg5Qoj2L113GHnZXQd8qCLlmTvyR0fBA18XPsTj28x0Xujtol8QtuCj9ABSeX7KkAjwwI6dgq3X/b/7TBlLdPVvYwv96y4XCm2exgZggU/uX3CAEsCCacwARAc3akK+ALjgYzu5fto3U18="
  # GITHUB_ACCESS_TOKEN=[secure]
- - secure: "EKO+qRXIxNEEHvOD2iZN0UaU91J+3IKv+A+o/cdsbbYN4YdL0m9vXsKEi3XmcwVjksZYpQKFqfrUz2bb92nNe7wngaAPJocQ3Ba9VpWZDtmsYMsuN+THdKm//E/B5nBP8jyPz4pAgcuQgm7xRekNCtgB+DUijO8WHEv1zJQhtr1Df2KfEaUAdx2CoLrE50kVztXZ3AJqAY0buKMrSTieysEH9drEleEDTaMZaTrNjV/PzGCpcXApOl4uHfndyNksd8FcwN/+9HtTh2nKODCdHz+scjTWDj8XSvOzWM+wxR6f9SQdp6bIaW1q1P1EKLjAk7IY4GEdRycFXUC4aX+ckt9COJd1iMk1u6cWz+2cIFHk0vYiDPhBls7i+QlpbPbGeXBg7i0FgljG+sp6o1quAlfF4I2e5W6xlD9CeWMRmhlUwCvvLx3V710f2oDrxHZYpHhOKLuVnpfkqwpSNG5vGEQ0cCRPKIzjodkTiGS0JtNKrk9W3HvASxgZ4iBw8s6dOEFAud8XDn1H+G3ty3G634PqzMCjawEmtbVeORsXXjG1lA1q6QpeBSCFpN9cgnj57YT/hGkPVfuwzbYvARbbf6JmKMKYrsABdxWFskwkSj7RxuPHhIYVQaYpbaUp0kBkWhDi3Ga1ZD4KpYXgT8/IjT0nrairZRzs2T1Se3CGe6c="
+ - secure: "srBWAyZIY44XzHSaWqJq4T70KSopqa1sa6fcPQeIp2lQcog9F2PWQX+0bS7q1USDEasvfWy+kwyZ4OAff+BbzBtz4P+jSDsAN7jGOe2C9YFchq1eTaxM9Uty4V6HRe5zZGgFbleM2W5A5jfnWwiwX3PnCDXE2T1xNmaGY4TrVFulQZ2oEJJMHXf6fhqjEa2JudyRpNzle2ijPxOIRXa/g6+HfSjQW/Y0OHybi7wMVJV2mRM+A1B75z1DoowAZfYDHwSgjQs0r3NCQJCffBJ+lJLl+gl47IRnu0E+y7tscgWjxXlLIPX9SQBiwE9nrcErZwL/QJLBhZMtKofDzZAiZ7xW5FtS8qD6Bho0Sc+qG/BzHRen4eVvTDGPGDNCyr98xaAeLgu0ohPzKLjblgXc/gLMoFly3QDdx1q1wjJBVKZezJhbtOxgjFYGYAuH/gtvkBhzpbhhk3MxGl6bP0ksUf4DB5lhjVVHoccRfDFN14ZDoIMUYF+mwqybdE7WIoHp0JVVbHSMB5JwrUutV0/y7YcwnTRaBGpFB9kLaJheNgl5F74CFiHwns+a4Xl54cvawydWrgBCKtJUx4Bz8tY2muh7gGWAyQLJo/8T74k5e05MkpP9MEwejphFh1Ja0jFP1HlZRj8myZPkmqbk3nmZmIysRV0ULPEExSKH3EKVqWM="
  # SNYK_API_TOKEN=[secure]
  - secure: "JVaYl9zH8UhAoWwQ9/fgY9suezRkYutPazkQjaoFS5oZHLn0CucNQdXDNEslyLMfRYpAsjqoXRjFI8bY4md+8/CIdBiBmfMEVX+Zwue7GrpqqovqW6gIlNnmMX4Xzd1R0sgGzr6cZr2SaAv3ryvN/RX/JzHVOSDjlrZIWrj4GznDLehXZieQC1A4H1VjzHazUSJ5PpQ6Vl3F0rW7MqHyaO6O1EMkHv2LwX6Ojp79d3MwyggjUB2VudnXyOYypP6JKGWv0cMV8N8YbyJM+c8nkxr41EV4lM7Z6s7aA+Z0G00A8V8YSsdLOvh045cxOA7ehu0EWIXxl4umR/V5FzN504YyM0a3ILo9/uan6esFRZGBftY1H5Aww0fw6yORkA2oZhB/fClLNhrNzGl2F//BgVY9yjsPI7vCeX3kZNsf8AtMVMeEENnYqfxv334PNVuddkBE3+XmqJQ9Kxz4nsh7AmMwHx/EnIfpi16YI2xJkb/kdnhb8P9BDUpjXd37tIVvNRdVGKPwzvjCkv4Gl7ZfEetsi904io9sj3KNCi3FQSUJrWb/ck7LGSsdgt0thKvjjavOvJC19FWq97YuU2ouV5+MFnQCCbNrF/62RVhmso7MZEdxewQLOnKKJomPuiHcjeQaDvkOepn7L8ost1OLq5jhh51Zv6gpoCkYc8/jlqA="
+ # ATM_CERTIFICATE=[secure]
+ - secure: "obJbDccUmdb5BV0q9eup6qutmT1z9gBo7JEZr33OSCMb4GQGHUmpANLsxcFGwh9NZdoRGGOn1ZNHK28O2oLdIVROTKxKDDNNNyyRl8fnrhhsQRa/L4MNttsrv4J779R0dhMSRgqXXJN5urAYCHMt5A7ZVA48p6KKAsE+H8ukHnHzN7Q9KD67cGm5jml780iy6crzGD9mnZXhjmPp2LTmGclocj6KkRr1p35Ij88/UFtVjw/I0oVmxhG4fhgy52403q1Fb/IEVJQNt1bNpewPiTzKUkZiMM+flOso2A/Rc6Uf5z+6nooGCCu/UbCIRdu2cOGjlORS1vvYppfedxoLX0mwmMEloJ7gLh8DO+hEfocMf24ktT1DoXuOInbXdF5wSzXMiJ+avP+7fB2kveHZNJ/tUiDzZ63dPH7FXr+kXKrWHrTne8MBoUOf8C+/GYmmoEHrzTmn1CvL0t6z7cCzi6xVNNvmzgz+mwxo8NYCT8wYxLtVNwY4Znsx5skMBd6TFumCUZAy3qfCnA2C6lhYleQoJ7aiek7tCJO4czZzGlBJCyYzioRHpbfdC9oMETwEmwFSBwGgBAPjDNcYeBJXz2BrnzWiRxi+tjNDYx7fMMXJF3xDY9jgNGlyhbYr+dIE3D4w8XuXNhlacO4t5SSlfcl4p8Ag4SB4RECwrrf+Ixk="
 
 stage: "Run Unit Tests :clipboard:"
 node_js:
  - 6
  - 8
 before_install:
- - npm install -g recink
- - npm install -g recink-codeclimate
- - npm install -g recink-snyk
+ - source bin/deploy/init.sh
 script:
  - recink run unit -c recink-codeclimate -c recink-snyk
+
+jobs:
+ include:
+ - stage: "Deploy To :cloud:"
+ node_js: 6
+ script:
+ - if [ ${ALLOW_DEPLOY} == 1 ]; then node bin/deploy; else echo "Skipping deploy"; fi
+ after_failure:
+ - deepify undeploy src --loglevel=debug
+
+## Temporarily turned off (Electron issue)
+# - stage: "Run e2e Tests :clipboard:"
+# node_js: 8
+# script:
+# - if [ ${ALLOW_DEPLOY} == 1 ]; then recink run e2e; else echo "Skipping e2e tests"; fi
+# addons:
+# firefox: 'latest'
+# chrome: 'beta'
+# apt:
+# packages:
+# - xvfb
+# install:
+# - 'export DISPLAY='':99.0'''
+# - 'Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &'
+
+ - stage: "Page speed :rocket:"
+ node_js: 6
+ script:
+ - if [ ${ALLOW_DEPLOY} == 1 ]; then recink run unit -s emit -c recink-pagespeed; else echo "Skipping pagespeed"; fi