From bc855ed6489beeff85250359fa4c1e3ac64bfceb Mon Sep 17 00:00:00 2001
From: Neelanjan Sen <14229985+Fawke@users.noreply.github.com>
Date: Tue, 8 Oct 2019 00:26:04 +0530
Subject: [PATCH] Circle CI runs e2e tests on every push (#4200)

* run functional tests on circle ci on push to any remote branch

* remove extraneous key from config file

* add test.localhost as alias to 127.0.0.1

* check 0: execute circle-ci

* move /etc/config to a separate command

* change bid partner to rubicon

* test appnexus bid adapter in ci

* comment browserstack command

* remove console.log statement

* test1: circle-ci

* change reference dev -> prod while loading prebid

* add console.log statement

* check-2: circle-ci

* comment browserstack testing

* change bid adapter

* change bid adapter

* remove test case for checking targeting keys

* remove the ci flag

* uncomment test for checking correct generation of targeting keys

* swap AN -> Rubicon for testing targeting keys
---
 .circleci/config.yml                          |  5 ++++
 gulpfile.js                                   | 29 +++++++++++++++----
 .../basic_w_custom_adserver_translation.html  |  4 +--
 .../basic_w_requireExactDuration.html         |  4 +--
 .../basic_wo_brandCategoryExclusion.html      |  4 +--
 .../basic_wo_requireExactDuration.html        |  4 +--
 test/pages/banner.html                        | 16 +++++-----
 test/pages/native.html                        |  2 +-
 test/pages/outstream.html                     |  2 +-
 test/pages/video.html                         |  2 +-
 test/spec/e2e/banner/basic_banner_ad.spec.js  | 20 ++++++-------
 wdio.conf.js                                  |  8 ++++-
 12 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca6713bb587..73ec23aa740 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,6 +34,7 @@ jobs:
           key: v1-dependencies-{{ checksum "package.json" }}
 
       - run: sudo npm install -g gulp-cli
+
       # Download and run BrowserStack local
       - run:
           name : Download BrowserStack Local binary and start it.
@@ -48,3 +49,7 @@ jobs:
       - run: 
           name: BrowserStack testing
           command: gulp test --browserstack --nolintfix
+      # run e2e tests
+      - run:
+          name: Functional testing
+          command: echo "127.0.0.1 test.localhost" | sudo tee -a /etc/hosts && gulp e2e-test --host=test.localhost --file=./test/spec/e2e/banner/basic_banner_ad.spec.js
diff --git a/gulpfile.js b/gulpfile.js
index 24c628ef228..2566b52de59 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -214,16 +214,35 @@ function bundle(dev, moduleArr) {
 // If --browserstack is given, it will run the full suite of currently supported browsers.
 // If --browsers is given, browsers can be chosen explicitly. e.g. --browsers=chrome,firefox,ie9
 // If --notest is given, it will immediately skip the test task (useful for developing changes with `gulp serve --notest`)
+
 function test(done) {
   if (argv.notest) {
     done();
   } else if (argv.e2e) {
     let wdioCmd = path.join(__dirname, 'node_modules/.bin/wdio');
     let wdioConf = path.join(__dirname, 'wdio.conf.js');
-    let wdioOpts = [
-      wdioConf
-    ];
-    return execa(wdioCmd, wdioOpts, { stdio: 'inherit' });
+    let wdioOpts;
+
+    if (argv.file) {
+      wdioOpts = [
+        wdioConf,
+        `--spec`,
+        `${argv.file}`
+      ]
+    } else {
+      wdioOpts = [
+        wdioConf
+      ];
+    }
+    execa(wdioCmd, wdioOpts, { stdio: 'inherit' })
+      .then(stdout => {
+        done();
+        process.exit(0);
+      })
+      .catch(err => {
+        done(new Error(`Tests failed with error: ${err}`));
+        process.exit(1);
+      });
   } else {
     var karmaConf = karmaConfMaker(false, argv.browserstack, argv.watch, argv.file);
 
@@ -315,7 +334,7 @@ gulp.task('build-postbid', gulp.series(escapePostbidConfig, buildPostbid));
 gulp.task('serve', gulp.series(clean, lint, gulp.parallel('build-bundle-dev', watch, test)));
 gulp.task('default', gulp.series(clean, makeWebpackPkg));
 
-gulp.task('e2e-test', gulp.series(clean, setupE2e, gulp.parallel('build-bundle-dev', watch), test))
+gulp.task('e2e-test', gulp.series(clean, setupE2e, gulp.parallel('build-bundle-prod', watch), test))
 // other tasks
 gulp.task(bundleToStdout);
 gulp.task('bundle', gulpBundle.bind(null, false)); // used for just concatenating pre-built files with no build step
diff --git a/integrationExamples/longform/basic_w_custom_adserver_translation.html b/integrationExamples/longform/basic_w_custom_adserver_translation.html
index 995ea822da4..8f4d46c3079 100644
--- a/integrationExamples/longform/basic_w_custom_adserver_translation.html
+++ b/integrationExamples/longform/basic_w_custom_adserver_translation.html
@@ -5,7 +5,7 @@
   <title>Prebid Freewheel Integration Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <!-- <script async src="//acdn.adnxs.com/prebid/not-for-prod/1/prebid.js"></script> -->
-  <script src="/build/dev/prebid.js" async=true></script>
+  <script src="/build/dist/prebid.js" async=true></script>
   <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
   <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
     integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
@@ -129,4 +129,4 @@ <h2 class="mb-0">
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/integrationExamples/longform/basic_w_requireExactDuration.html b/integrationExamples/longform/basic_w_requireExactDuration.html
index 016b51d09c4..5a902cf913e 100644
--- a/integrationExamples/longform/basic_w_requireExactDuration.html
+++ b/integrationExamples/longform/basic_w_requireExactDuration.html
@@ -5,7 +5,7 @@
   <title>Prebid Freewheel Integration Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <!-- <script async src="//acdn.adnxs.com/prebid/not-for-prod/1/prebid.js"></script> -->
-  <script src="/build/dev/prebid.js" async=true></script>
+  <script src="/build/dist/prebid.js" async=true></script>
   <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
   <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
     integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
@@ -127,4 +127,4 @@ <h2 class="mb-0">
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/integrationExamples/longform/basic_wo_brandCategoryExclusion.html b/integrationExamples/longform/basic_wo_brandCategoryExclusion.html
index c8af5801406..d60effe92f7 100644
--- a/integrationExamples/longform/basic_wo_brandCategoryExclusion.html
+++ b/integrationExamples/longform/basic_wo_brandCategoryExclusion.html
@@ -5,7 +5,7 @@
   <title>Prebid Freewheel Integration Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <!-- <script async src="//acdn.adnxs.com/prebid/not-for-prod/1/prebid.js"></script> -->
-  <script src="/build/dev/prebid.js" async=true></script>
+  <script src="/build/dist/prebid.js" async=true></script>
   <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
   <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
     integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
@@ -127,4 +127,4 @@ <h2 class="mb-0">
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/integrationExamples/longform/basic_wo_requireExactDuration.html b/integrationExamples/longform/basic_wo_requireExactDuration.html
index 215138479cc..b3cc0304585 100644
--- a/integrationExamples/longform/basic_wo_requireExactDuration.html
+++ b/integrationExamples/longform/basic_wo_requireExactDuration.html
@@ -5,7 +5,7 @@
   <title>Prebid Freewheel Integration Demo</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <!-- <script async src="//acdn.adnxs.com/prebid/not-for-prod/1/prebid.js"></script> -->
-  <script src="/build/dev/prebid.js" async=true></script>
+  <script src="/build/dist/prebid.js" async=true></script>
   <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
   <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
     integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
@@ -128,4 +128,4 @@ <h2 class="mb-0">
 
 </body>
 
-</html>
\ No newline at end of file
+</html>
diff --git a/test/pages/banner.html b/test/pages/banner.html
index 03f3b9b9e54..05085089f72 100644
--- a/test/pages/banner.html
+++ b/test/pages/banner.html
@@ -7,7 +7,7 @@
 	<title>Prebid.js Banner Example</title>
 
 	<!-- Prebid.js -->
-	<script async src="../../build/dev/prebid.js"></script>
+	<script async src="../../build/dist/prebid.js"></script>
 
 	<!-- Google Publisher Tag -->
 	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
@@ -38,9 +38,11 @@
 				}
 			},
 			bids: [{
-				bidder: 'appnexus',
+				bidder: "rubicon",
 				params: {
-					placementId: 13144370
+					accountId: 14062,
+					siteId: 70608,
+					zoneId: 498816
 				}
 			}]
 		}];
@@ -74,7 +76,7 @@
 			googletag
 				.defineSlot('/19968336/header-bid-tag-0', [[300, 250], [300, 600]], 'div-gpt-ad-1460505748561-0')
 				.addService(googletag.pubads());
-			
+
 			googletag.pubads().enableSingleRequest();
 			googletag.enableServices();
 		});
@@ -84,9 +86,9 @@
 <body>
 	<h2>Prebid.js Banner Ad Unit Test</h2>
 	<div id='div-gpt-ad-1460505748561-0'>
-      <script>
-        googletag.cmd.push(() => { googletag.display('div-gpt-ad-1460505748561-0'); });
-      </script>
+		<script>
+			googletag.cmd.push(() => { googletag.display('div-gpt-ad-1460505748561-0'); });
+		</script>
 	</div>
 	<div id="targeting-keys"></div>
 </body>
diff --git a/test/pages/native.html b/test/pages/native.html
index 0823f486848..f382ab8aad7 100644
--- a/test/pages/native.html
+++ b/test/pages/native.html
@@ -7,7 +7,7 @@
 	<title>Prebid.js Native Example</title>
 
 	<!-- Prebid.js -->
-	<script async src="../../build/dev/prebid.js"></script>
+	<script async src="../../build/dist/prebid.js"></script>
 
 	<!-- Google Publisher Tag -->
 	<script async src="https://www.googletagservices.com/tag/js/gpt.js"></script>
diff --git a/test/pages/outstream.html b/test/pages/outstream.html
index 56e443a519b..2a0543095cd 100644
--- a/test/pages/outstream.html
+++ b/test/pages/outstream.html
@@ -7,7 +7,7 @@
 	<title>Prebid.js Video Outstream Example</title>
 
 	<!-- Load Prebid.js -->
-	<script async src="../../build/dev/prebid.js"></script>
+	<script async src="../../build/dist/prebid.js"></script>
 
 	<!-- Load Google Publisher Tag -->
 	<script async src="https://securepubads.g.doubleclick.net/tag/js/gpt.js"></script>
diff --git a/test/pages/video.html b/test/pages/video.html
index e040b65fe23..3fabeb14b94 100644
--- a/test/pages/video.html
+++ b/test/pages/video.html
@@ -16,7 +16,7 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/videojs-vast-vpaid/2.0.2/videojs_5.vast.vpaid.min.js"></script>
 
     <!-- prebid.js -->
-    <script src="../../build/dev/prebid.js" async=true></script>
+    <script src="../../build/dist/prebid.js" async=true></script>
 
 
     <script>
diff --git a/test/spec/e2e/banner/basic_banner_ad.spec.js b/test/spec/e2e/banner/basic_banner_ad.spec.js
index ee01ce627db..9929b77a56a 100644
--- a/test/spec/e2e/banner/basic_banner_ad.spec.js
+++ b/test/spec/e2e/banner/basic_banner_ad.spec.js
@@ -5,15 +5,15 @@ const TEST_PAGE_URL = `${protocol}://${host}:9999/test/pages/banner.html`;
 const CREATIVE_IFRAME_CSS_SELECTOR = 'iframe[id="google_ads_iframe_/19968336/header-bid-tag-0_0"]';
 
 const EXPECTED_TARGETING_KEYS = {
-  hb_format: 'banner',
-  hb_source: 'client',
-  hb_pb: '0.50',
-  hb_bidder: 'appnexus',
-  hb_format_appnexus: 'banner',
-  hb_source_appnexus: 'client',
-  hb_pb_appnexus: '0.50',
-  hb_bidder_appnexus: 'appnexus'
-}
+  'hb_format': 'banner',
+  'hb_source': 'client',
+  'hb_pb': '0.60',
+  'hb_bidder': 'rubicon',
+  'hb_format_rubicon': 'banner',
+  'hb_source_rubicon': 'client',
+  'hb_pb_rubicon': '0.60',
+  'hb_bidder_rubicon': 'rubicon'
+};
 
 describe('Prebid.js Banner Ad Unit Test', function () {
   before(function loadTestPage() {
@@ -38,7 +38,7 @@ describe('Prebid.js Banner Ad Unit Test', function () {
 
     expect(targetingKeys).to.include(EXPECTED_TARGETING_KEYS);
     expect(targetingKeys.hb_adid).to.be.a('string');
-    expect(targetingKeys.hb_adid_appnexus).to.be.a('string');
+    expect(targetingKeys.hb_adid_rubicon).to.be.a('string');
     expect(targetingKeys.hb_size).to.satisfy((size) => size === '300x250' || '300x600');
   });
 
diff --git a/wdio.conf.js b/wdio.conf.js
index 9e816bef24b..dd94e82cf90 100644
--- a/wdio.conf.js
+++ b/wdio.conf.js
@@ -9,8 +9,14 @@ function getCapabilities() {
     return platformMap[os];
   }
 
-  // remove the IE11 browser from functional tests
+  // only Edge 16, Chrome 74 & Firefox 66 run as part of functional tests
+  // rest of the browsers are discarded.
   delete browsers['bs_ie_11_windows_10'];
+  delete browsers['bs_edge_17_windows_10'];
+  delete browsers['bs_chrome_75_windows_10'];
+  delete browsers['bs_firefox_67_windows_10'];
+  delete browsers['bs_safari_11_mac_high_sierra'];
+  delete browsers['bs_safari_12_mac_mojave'];
 
   let capabilities = []
   Object.keys(browsers).forEach(key => {