From 2f8cc11967a1fe170a3bc467f054a84b49645be5 Mon Sep 17 00:00:00 2001
From: Erik Harper <eharperdicianno@esri.com>
Date: Wed, 25 Nov 2020 12:10:51 -0800
Subject: [PATCH] build: adding screener baseBranch to config (#1314)

This fixes Screener not diffing properly to the master baseline screenshots.
---
 .travis.yml        | 2 +-
 screener.config.js | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3444dfb5d25..cf92f5417f4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,6 @@ notifications:
   webhooks:
     secure: "NtIaVttZMs7AUSzJHGriM2fdQcdzpg65d7f/10Hdeu0wSjhmKiV/74QRcwc60MhNdWSxgq4ecdsR/n1Bhm4e5RvPTxLKBZrjeUn72UefZ/B7Kt4QMQWhBMp6AxShsPQNBkSSuk7jL/QrbGuaLBjmquzxJBHp3et9BKth+Ew+T4NQk7J9EqNtrWlipV1acobkQW8nJZEg3Y1bESaVY69ebozVYJMDDjk0SL2XYCUAz2w9aZ2x/sodzjLLxC01Ouxd7G1h/Zvuvvhjqh3UmgH15E1QUcFI7X/zU+bwIg+trndALQbuVBuzSVpWiIM3Pe5+uiBtkSQqQRHkZj91OHDSKjTLwAsWhHHw6d+/GYTaZ0ful2riwxMyXpNR4Zv65aEnYMftZ4hk7okrVwkIBtpiUwwIe/F1RF2h+X0I8ontDevNqd492ZyXFUOtebOiWYOmgJPOso1dAl+ADnkoyJNY14o6ouBl4TPji71T8jGzGVGz3Cn5/Ww8sE60cFgLoHacXxtoe43nsx384skBfGKPrxujj2GoVRRInJCd2jECpNDVTVlXwnojtOoR0LUboJYpVHA40QAcm88YiscY+PZbIreF/kCcxEAmFw95CY5p9op93bfUgbetp7bGkbtAptRtiDA4Wz5EqUSSh5POSKUhCAqMpYU1It1Th7LHqRgelcU="
 script:
-  - npm test
   - npm run test:storybook
+  - npm test
 services: xvfb
diff --git a/screener.config.js b/screener.config.js
index 0924f5d48bd..6c5c542c2e5 100644
--- a/screener.config.js
+++ b/screener.config.js
@@ -4,9 +4,10 @@ module.exports = {
   storybookStaticDir: './__docs-temp__',
   apiKey: process.env.SCREENER_API_KEY,
   resolution: '1024x768',
+  baseBranch: 'master',
   browsers: [
     {
       browserName: 'chrome'
     }
   ]
-};
\ No newline at end of file
+};