Merge branch 'development' into fix-dropdown-demo-toggling

valor-software · Mar 29, 2018 · 542e8be · 542e8be
2 parents da6f255 + d8ee1f8
commit 542e8be
Show file tree

Hide file tree

Showing 34 changed files with 1,656 additions and 758 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -89,13 +89,9 @@ jobs:
 
 #     test cypress
     - stage: cypress-tests
-      env: URL=http://localhost:3000/
-      before_script:
-      - npm run build:dynamic
-      - node  ./demo/dist/server.js &
-      - sleep 3
-      script:
-      - CYPRESS_baseUrl=$URL npm run cy:run -- --config videoRecording=false
+      env: URL=localhost:4200/#
+      before_script: ng serve --prod &
+      script: $(npm bin)/wait-on http-get://$URL && npm run cy:run
 
 #    check prod build
     - &build

diff --git a/cypress.json b/cypress.json
@@ -1,3 +1,3 @@
 {
-  "baseUrl": "http://localhost:4400/#"
+  "baseUrl": "http://localhost:4200/#"
 }
diff --git a/cypress/integration/accordion_page_spec.ts b/cypress/integration/accordion_page_spec.ts
diff --git a/cypress/integration/alerts_page_spec.ts b/cypress/integration/alerts_page_spec.ts