From ae9e79e6bcbb2e74dc0c1b0000ff60e4159028cd Mon Sep 17 00:00:00 2001
From: Tulio Casagrande <tcasagra@thoughtworks.com>
Date: Mon, 5 Jun 2017 13:05:22 -0300
Subject: Install chromedriver from github

The latest chromedriver version is getting recurring errors when
running login.feature from functional tests
---
 .../modules/chromedriver/manifests/init.pp         | 37 ++++++++++++++++++++++
 provisioning/modules/pixelated/manifests/source.pp |  4 +--
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 provisioning/modules/chromedriver/manifests/init.pp

diff --git a/provisioning/modules/chromedriver/manifests/init.pp b/provisioning/modules/chromedriver/manifests/init.pp
new file mode 100644
index 00000000..d3f0a414
--- /dev/null
+++ b/provisioning/modules/chromedriver/manifests/init.pp
@@ -0,0 +1,37 @@
+# install chromedriver for functional tests
+# we ship our local copy of chromedriver
+# because latest versions are getting recurring errors on
+# test/functional/features/login.feature#Then I should see the fancy interstitial
+
+class chromedriver (
+  $release       = '1.0_beta1',
+  $chromedriver  = 'chromedriver_2.27_linux64.zip',
+  $google_chrome = 'google-chrome-stable_54.0.2840.100-1_amd64.deb',
+) {
+
+  exec { 'fetch_chromedriver':
+    command => "/usr/bin/wget https://github.com/pixelated/pixelated-user-agent/releases/download/${release}/${chromedriver}",
+    cwd     => '/var/tmp',
+    creates => "/var/tmp/${chromedriver}",
+  }
+
+  exec { 'fetch_google_chrome':
+    command => "/usr/bin/wget https://github.com/pixelated/pixelated-user-agent/releases/download/${release}/${google_chrome}",
+    cwd     => '/var/tmp',
+    creates => "/var/tmp/${google_chrome}",
+  }
+
+  exec { 'unpack_chromedriver':
+    command => "/usr/bin/unzip ${chromedriver} -d /usr/local/bin/",
+    cwd     => '/var/tmp/',
+    creates => '/usr/local/bin/chromedriver',
+  }
+
+  exec { 'install_google_chrome':
+    command => "/usr/bin/dpkg -i ${google_chrome} || /usr/bin/apt-get -y -f install",
+    cwd     => '/var/tmp/',
+    unless  => '/usr/bin/dpkg -l google-chrome-stable > /dev/null 2>&1',
+    require => [ Exec['apt_get_update'] ],
+  }
+
+}
diff --git a/provisioning/modules/pixelated/manifests/source.pp b/provisioning/modules/pixelated/manifests/source.pp
index de4ade1e..691a3fbc 100644
--- a/provisioning/modules/pixelated/manifests/source.pp
+++ b/provisioning/modules/pixelated/manifests/source.pp
@@ -1,5 +1,6 @@
 # install requirements for setting up the useragent from source
 class pixelated::source {
+  include chromedriver
 
   package { [
     'git',
@@ -15,14 +16,13 @@ class pixelated::source {
     'ruby-compass',
     'xvfb',
     'xauth',
-    'chromedriver',
     'phantomjs'
     ]:
       ensure => latest
   }
 
   package { ['sass', 'compass']:
-    ensure => latest,
+    ensure   => latest,
     provider => 'gem',
   }
 
-- 
cgit v1.2.3


From b9467308bf33ea3cbff30598ec47607565a02463 Mon Sep 17 00:00:00 2001
From: Tulio Casagrande <tcasagra@thoughtworks.com>
Date: Mon, 5 Jun 2017 13:27:22 -0300
Subject: Remove old chromedriver path

---
 Makefile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Makefile b/Makefile
index 899b6c80..1c8e8172 100644
--- a/Makefile
+++ b/Makefile
@@ -79,13 +79,11 @@ integration_tests_py:
 
 functional_tests: clean requirements install
 	@. $(VIRTUALENV)/bin/activate;\
-	export PATH=$(PATH):/usr/lib/chromium/;\
 	cd service;\
 	xvfb-run --server-args="-screen 0 1280x1024x24" behave --tags ~@wip --tags ~@smoke test/functional/features
 
 smoke_tests: clean install
 	@. $(VIRTUALENV)/bin/activate;\
-	export PATH=$(PATH):/usr/lib/chromium/;\
 	cd service;\
 	xvfb-run --server-args="-screen 0 1280x1024x24" behave --tags ~@wip --tags @smoke test/functional/features -k -D host=$(provider)
 
@@ -96,7 +94,6 @@ functional_tests_ci: clean requirements install
 
 functional_tests_wip:
 	@. $(VIRTUALENV)/bin/activate;\
-	export PATH=$(PATH):/usr/lib/chromium/;\
 	cd service;\
 	xvfb-run --server-args="-screen 0 1280x1024x24" behave --tags @wip test/functional/features
 
-- 
cgit v1.2.3


From 528fe698da03dd751d6516cbbd5f520c4506957e Mon Sep 17 00:00:00 2001
From: Tulio Casagrande <tcasagra@thoughtworks.com>
Date: Tue, 6 Jun 2017 14:21:49 -0300
Subject: Add missing requires to chromedriver module

---
 provisioning/modules/chromedriver/manifests/init.pp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/provisioning/modules/chromedriver/manifests/init.pp b/provisioning/modules/chromedriver/manifests/init.pp
index d3f0a414..709d8aa1 100644
--- a/provisioning/modules/chromedriver/manifests/init.pp
+++ b/provisioning/modules/chromedriver/manifests/init.pp
@@ -25,13 +25,14 @@ class chromedriver (
     command => "/usr/bin/unzip ${chromedriver} -d /usr/local/bin/",
     cwd     => '/var/tmp/',
     creates => '/usr/local/bin/chromedriver',
+    require => [ Exec['fetch_chromedriver'] ],
   }
 
   exec { 'install_google_chrome':
     command => "/usr/bin/dpkg -i ${google_chrome} || /usr/bin/apt-get -y -f install",
     cwd     => '/var/tmp/',
     unless  => '/usr/bin/dpkg -l google-chrome-stable > /dev/null 2>&1',
-    require => [ Exec['apt_get_update'] ],
+    require => [ Exec['fetch_google_chrome'], Exec['apt_get_update'] ],
   }
 
 }
-- 
cgit v1.2.3