From ee22c023f19977abe1e0cf88abc9998c53df4e63 Mon Sep 17 00:00:00 2001
From: evilaliv3 <giovanni.pellerano@evilaliv3.org>
Date: Fri, 24 Jun 2016 17:10:55 +0200
Subject: [PATCH] Remove browsers beta versions from testing

it does not make any sense to test a browser versions that we do not know
---
 .travis.yml | 42 ++++++++++++++++++------------------------
 travis.sh   |  2 --
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2114a728..399739ed 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,45 +16,39 @@ matrix:
     - node_js: "5"
       env: OPENPGPJSTEST='unit' OPENPGP_NODE_JS='5'
     - node_js: "4"
-      env: OPENPGPJSTEST='end2end-4' BROWSER='chrome 46'
+      env: OPENPGPJSTEST='end2end-3' BROWSER='chrome 46'
     - node_js: "4"
       env: OPENPGPJSTEST='end2end-1' BROWSER='firefox 42'
     - node_js: "4"
-      env: OPENPGPJSTEST='end2end-9' BROWSER='safari 9'
+      env: OPENPGPJSTEST='end2end-7' BROWSER='safari 9'
     - node_js: "4"
-      env: OPENPGPJSTEST='end2end-6' BROWSER='internet explorer 11'
+      env: OPENPGPJSTEST='end2end-4' BROWSER='internet explorer 11'
     - node_js: "4"
       env: OPENPGPJSTEST='end2end-0' BROWSER='firefox 38'
     - node_js: "4"
-      env: OPENPGPJSTEST='end2end-2' BROWSER='firefox beta'
+      env: OPENPGPJSTEST='end2end-2' BROWSER='chrome 38'
     - node_js: "4"
-      env: OPENPGPJSTEST='end2end-3' BROWSER='chrome 38'
+      env: OPENPGPJSTEST='end2end-5' BROWSER='microsoft edge 20.10240'
     - node_js: "4"
-      env: OPENPGPJSTEST='end2end-5' BROWSER='chrome beta'
+      env: OPENPGPJSTEST='end2end-6' BROWSER='safari 8'
     - node_js: "4"
-      env: OPENPGPJSTEST='end2end-7' BROWSER='microsoft edge 20.10240'
+      env: OPENPGPJSTEST='end2end-8' BROWSER='android 4.4'
     - node_js: "4"
-      env: OPENPGPJSTEST='end2end-8' BROWSER='safari 8'
+      env: OPENPGPJSTEST='end2end-9' BROWSER='android 5.1'
     - node_js: "4"
-      env: OPENPGPJSTEST='end2end-10' BROWSER='android 4.4'
+      env: OPENPGPJSTEST='end2end-10' BROWSER='iphone 7.0'
     - node_js: "4"
-      env: OPENPGPJSTEST='end2end-11' BROWSER='android 5.1'
-    - node_js: "4"
-      env: OPENPGPJSTEST='end2end-12' BROWSER='iphone 7.0'
-    - node_js: "4"
-      env: OPENPGPJSTEST='end2end-13' BROWSER='iphone 9.1'
+      env: OPENPGPJSTEST='end2end-11' BROWSER='iphone 9.1'
   allow_failures:
     - env: OPENPGPJSTEST='end2end-0' BROWSER='firefox 38'
-    - env: OPENPGPJSTEST='end2end-2' BROWSER='firefox beta'
-    - env: OPENPGPJSTEST='end2end-3' BROWSER='chrome 38'
-    - env: OPENPGPJSTEST='end2end-5' BROWSER='chrome beta'
-    - env: OPENPGPJSTEST='end2end-6' BROWSER='internet explorer 11'
-    - env: OPENPGPJSTEST='end2end-7' BROWSER='microsoft edge 20.10240'
-    - env: OPENPGPJSTEST='end2end-8' BROWSER='safari 8'
-    - env: OPENPGPJSTEST='end2end-10' BROWSER='android 4.4'
-    - env: OPENPGPJSTEST='end2end-11' BROWSER='android 5.1'
-    - env: OPENPGPJSTEST='end2end-12' BROWSER='iphone 7.0'
-    - env: OPENPGPJSTEST='end2end-13' BROWSER='iphone 9.1'
+    - env: OPENPGPJSTEST='end2end-2' BROWSER='chrome 38'
+    - env: OPENPGPJSTEST='end2end-4' BROWSER='internet explorer 11'
+    - env: OPENPGPJSTEST='end2end-5' BROWSER='microsoft edge 20.10240'
+    - env: OPENPGPJSTEST='end2end-6' BROWSER='safari 8'
+    - env: OPENPGPJSTEST='end2end-8' BROWSER='android 4.4'
+    - env: OPENPGPJSTEST='end2end-9' BROWSER='android 5.1'
+    - env: OPENPGPJSTEST='end2end-10' BROWSER='iphone 7.0'
+    - env: OPENPGPJSTEST='end2end-11' BROWSER='iphone 9.1'
 before_script:
   - npm install -g grunt-cli codeclimate-test-reporter
 script:
diff --git a/travis.sh b/travis.sh
index 9e368acd..1ad768dd 100755
--- a/travis.sh
+++ b/travis.sh
@@ -17,10 +17,8 @@ elif [[ $OPENPGPJSTEST =~ ^end2end-.* ]]; then
   declare -a capabilities=(
     "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"firefox\", \"version\":\"38.0\", \"platform\":\"Linux\"}'"
     "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"firefox\", \"version\":\"42.0\", \"platform\":\"OS X 10.10\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"firefox\", \"version\":\"beta\", \"platform\":\"Windows 10\"}'"
     "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"chrome\", \"version\":\"38.0\", \"platform\":\"Linux\"}'"
     "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"chrome\", \"version\":\"46.0\", \"platform\":\"OS X 10.10\"}'"
-    "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"chrome\", \"version\":\"beta\", \"platform\":\"Windows 10\"}'"
     "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"internet explorer\", \"version\":\"11\", \"platform\":\"Windows 10\"}'"
     "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"microsoftEdge\", \"version\":\"20.10240\", \"platform\":\"Windows 10\"}'"
     "export SELENIUM_BROWSER_CAPABILITIES='{\"browserName\":\"safari\", \"version\":\"8\", \"platform\":\"OS X 10.10\"}'"