From 0651458f36cf16664751c1178fa345a12f12af2d Mon Sep 17 00:00:00 2001
From: Jason Chen <jhchen7@gmail.com>
Date: Wed, 14 May 2014 10:39:23 -0700
Subject: [PATCH] encrypt master branch sauce key

---
 .travis.yml   | 30 +++++++++++++++++-------------
 test/karma.js |  8 +++-----
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 353eeffdd9..56ea59f7a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,16 +12,20 @@ branches:
     - /^sauce-.+$/
     - /^v\d+\.\d+\.\d+$/
 env:
-  - SAUCE_BROWSER=remote-mac-chrome
-  - SAUCE_BROWSER=remote-mac-firefox
-  - SAUCE_BROWSER=remote-mac-safari
-  - SAUCE_BROWSER=remote-windows-chrome
-  - SAUCE_BROWSER=remote-windows-firefox
-  - SAUCE_BROWSER=remote-windows-ie-11
-  - SAUCE_BROWSER=remote-windows-ie-10
-  - SAUCE_BROWSER=remote-windows-ie-9
-  - SAUCE_BROWSER=remote-linux-chrome
-  - SAUCE_BROWSER=remote-linux-firefox
-  - SAUCE_BROWSER=remote-ipad
-  - SAUCE_BROWSER=remote-iphone
-  - SAUCE_BROWSER=remote-android
+  global:
+    - secure: "SeXav7dHVe5RBv7pzdd4LIYNLLF2STKPuIw8lpo2X48Czb96wMLKYRcpehQiB8YPpACYryE0mpjEt0+qNLC2kxGLV57JP44ABTBbWS7MvrUwaKJILxr4usVInIJPHFPksN+oNjHwuRN8jR8a2pKQ0GBHeCcwKt0lIZZ8b7O12X4="
+    - secure: "WupAm8AsMBqQ8jZ1tLuXw8gHBUwV7NqwdcJ/idR8Fqum2RcHUzT5zlxlbmvjUMI6rJgjFLLF4gTHwNG219wskpuzEdXxLjpBqSmpUWyTlq2rgE9U/wT8H5/VWgH6v6Py1ZY6GxLdcC+Tqxf/5xupMfPoXPKbxpQ0DkYcVEfJkcU="
+  matrix:
+    - SAUCE_BROWSER=remote-mac-chrome
+    - SAUCE_BROWSER=remote-mac-firefox
+    - SAUCE_BROWSER=remote-mac-safari
+    - SAUCE_BROWSER=remote-windows-chrome
+    - SAUCE_BROWSER=remote-windows-firefox
+    - SAUCE_BROWSER=remote-windows-ie-11
+    - SAUCE_BROWSER=remote-windows-ie-10
+    - SAUCE_BROWSER=remote-windows-ie-9
+    - SAUCE_BROWSER=remote-linux-chrome
+    - SAUCE_BROWSER=remote-linux-firefox
+    - SAUCE_BROWSER=remote-ipad
+    - SAUCE_BROWSER=remote-iphone
+    - SAUCE_BROWSER=remote-android
diff --git a/test/karma.js b/test/karma.js
index a2259c8ebc..2469d48dea 100644
--- a/test/karma.js
+++ b/test/karma.js
@@ -73,8 +73,6 @@ module.exports = function(config) {
     singleRun: true,
     sauceLabs: {
       testName: 'Quill',
-      username: 'quill',
-      accessKey: 'adc0c0cf-221b-46f1-81b9-a4429b722c2e',
       build: os.hostname() + '-' + _.random(16*16*16*16).toString(16),
       options: {
         'public': 'public',
@@ -87,9 +85,9 @@ module.exports = function(config) {
   if (process.env.TRAVIS) {
     config.transports = ['xhr-polling'];
     config.sauceLabs.build = 'travis-' + process.env.TRAVIS_BUILD_ID;
-    if (process.env.TRAVIS_BRANCH == 'master' && !process.env.TRAVIS_PULL_REQUEST) {
-      config.sauceLabs.username = 'quill-master';
-      config.sauceLabs.accessKey = '685c8996-7b70-4543-8167-58f8e88a8484';
+    if (process.env.TRAVIS_BRANCH !== 'master' || process.env.TRAVIS_PULL_REQUEST) {
+      config.sauceLabs.username = 'quill';
+      config.sauceLabs.accessKey = 'adc0c0cf-221b-46f1-81b9-a4429b722c2e';
     }
   }
 }