From cea000b90c8ca9fd3a19729f77dad121fb66fafe Mon Sep 17 00:00:00 2001 From: Tom Bloor Date: Thu, 28 Sep 2017 14:12:25 +0100 Subject: [PATCH] Added ci specific e2e and test scripts --- .gitignore | 1 + .travis.yml | 2 ++ package.json | 5 +++-- src/environments/environment.ci.ts.enc | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 src/environments/environment.ci.ts.enc diff --git a/.gitignore b/.gitignore index 1f49108..67d6c52 100644 --- a/.gitignore +++ b/.gitignore @@ -45,6 +45,7 @@ testem.log /src/environments/environment.local.ts /src/environments/environment.prod.ts /src/environments/environment.dev.ts +/src/environments/environment.ci.ts # ========================= # Operating System Files diff --git a/.travis.yml b/.travis.yml index f262434..22ae810 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ addons: language: node_js node_js: - 8 +before_install: + - openssl aes-256-cbc -K $encrypted_9d2af3734b6c_key -iv $encrypted_9d2af3734b6c_iv -in src/environments/environment.ci.ts.enc -out src/environments/environment.ci.ts -d before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start diff --git a/package.json b/package.json index 1fd8e65..a6bcc31 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,11 @@ "start": "ng serve", "build": "ng build", "test": "ng test", - "test:once": "ng test --watch=false", + "test:ci": "ng test --watch=false --env=ci", "lint": "ng lint", "e2e": "ng e2e", - "ci": "npm run test:once && npm run e2e" + "e2e:ci": "ng e2e --env=ci", + "ci": "npm run test:ci && npm run e2e:ci" }, "private": true, "dependencies": { diff --git a/src/environments/environment.ci.ts.enc b/src/environments/environment.ci.ts.enc new file mode 100644 index 0000000..d7f9745 --- /dev/null +++ b/src/environments/environment.ci.ts.enc @@ -0,0 +1,2 @@ +gԟ^ f^ՍjAF$Qh0L+lD)9; +@&;q蠩 iE0#ҡŎbK7U%x_x/6m=P ?qFA$|'A製b1Ռ2~/,dL”P>S L \ No newline at end of file