From 0879105da245cc69d284e7331363c562d4c4a169 Mon Sep 17 00:00:00 2001 From: joshin4colours Date: Fri, 25 May 2018 11:33:03 -0400 Subject: [PATCH 1/5] used public cf server (#1) --- e2e-tests/protractor.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e-tests/protractor.conf.js b/e2e-tests/protractor.conf.js index 5a5ad39..305f4cf 100644 --- a/e2e-tests/protractor.conf.js +++ b/e2e-tests/protractor.conf.js @@ -39,7 +39,7 @@ exports.config = { // 'browserName': 'chrome' // }, - baseUrl: 'http://localhost:7225/index.html', + baseUrl: "https://cicd-angular-demo-app.cfapps.io/", framework: 'jasmine', From f48d86266770b0a32e813442c820b8510112e439 Mon Sep 17 00:00:00 2001 From: joshgrant Date: Mon, 28 May 2018 10:17:57 -0400 Subject: [PATCH 2/5] update to package.json repo reference --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b38a319..c49d800 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "private": true, "version": "1.0.2", "description": "A demo project for displaying CICD as a software process.", - "repository": "https://github.com/redmed86/pipeline-demo.git", + "repository": "https://github.com/aucelabs-sample-test-frameworks/sample-pipeline.git", "license": "MIT", "devDependencies": { "bower": "1.8.4", From 74f67a4fae11cb13de2daf94f3022e501a3adc1f Mon Sep 17 00:00:00 2001 From: joshgrant Date: Mon, 28 May 2018 10:50:58 -0400 Subject: [PATCH 3/5] trying run on Jenkins --- Jenkinsfile | 6 ++++-- e2e-tests/protractor.conf.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3e6eb51..f1401f0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,9 +20,11 @@ pipeline { } stage('Run Functional Tests') { steps { - sauce('e16593fe-6899-463b-9595-e5ba5eb46563') { + sauceconnect(options: '', sauceConnectPath: '', useGeneratedTunnelIdentifier: true) { + sauce('e16593fe-6899-463b-9595-e5ba5eb46563') { sh 'npm run protractor' - } + } + } } } } diff --git a/e2e-tests/protractor.conf.js b/e2e-tests/protractor.conf.js index 305f4cf..faea26b 100644 --- a/e2e-tests/protractor.conf.js +++ b/e2e-tests/protractor.conf.js @@ -39,7 +39,7 @@ exports.config = { // 'browserName': 'chrome' // }, - baseUrl: "https://cicd-angular-demo-app.cfapps.io/", + baseUrl: "http://localhost:7225/index.html", framework: 'jasmine', From 0d91e40ee6e355d5c9e19a80b02ef88546a52714 Mon Sep 17 00:00:00 2001 From: joshgrant Date: Mon, 28 May 2018 10:53:57 -0400 Subject: [PATCH 4/5] sauce labs credentials --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f1401f0..9fd41d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,8 +20,8 @@ pipeline { } stage('Run Functional Tests') { steps { - sauceconnect(options: '', sauceConnectPath: '', useGeneratedTunnelIdentifier: true) { - sauce('e16593fe-6899-463b-9595-e5ba5eb46563') { + sauce('e16593fe-6899-463b-9595-e5ba5eb46563') { + sauceconnect(options: '', sauceConnectPath: '', useGeneratedTunnelIdentifier: true) { sh 'npm run protractor' } } From d13086c6d38cb6edb61b4294c4ef66fa36b2f82b Mon Sep 17 00:00:00 2001 From: joshgrant Date: Mon, 28 May 2018 15:11:10 -0400 Subject: [PATCH 5/5] updated test names to something more distinctive --- e2e-tests/protractor.conf.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e-tests/protractor.conf.js b/e2e-tests/protractor.conf.js index faea26b..0a3db8e 100644 --- a/e2e-tests/protractor.conf.js +++ b/e2e-tests/protractor.conf.js @@ -22,14 +22,14 @@ exports.config = { browserName: 'firefox', version: 'latest', platform: 'OS X 10.10', - name: "firefox-tests", + name: "firefox-e2e-pipeline", shardTestFiles: true, maxInstances: 25 },{ browserName: 'firefox', version: 'latest', platform: 'Windows 7', - name: "firefox-tests", + name: "firefox-e2e-pipeline", shardTestFiles: true, maxInstances: 25 }