Alternate test script so complete suite is not always run

The CI SauceLabs tests should only run once a branch has been
merged.

Author: nfrasser

.travis.yml

@@ -7,7 +7,5 @@ env:
   global:
     - secure: LhH+mMqOktTe6cIt97PGKBfgUjZM8vRd0qddyg61FSxg7a3WrHQoHE8WdRioJ9+DDzpu/NSTsHEUFUpGN+kSRw1UY4tsNLH6HoBQnqrNN4tVOeefudJpdeteOKZrJ8r8TaA/eO7sAgXO2T+RLJ8+qTbhx8FVZtLaCAgkrS0w9Qk=
     - secure: Okwm1aAR3oo09AhHDsjFSq1UGlIUtWYYvYeoolJScC/UVFGMiK9oC4fzRtUHv3kXcnshDlcVDrr/Q5JL9Qx6E+tosPJp+tioaqE8X4IDbVk7PPs/ToOOEmWnGvxkgmfCGSDuneG8RVhILkhls3fbm0z+rRWlvJkjefeA96T6zps=
-script:
-  - npm test
-  - npm run test-ci
+script: ./test/run
 after_script: npm run coverage

test/run.sh

@@ -0,0 +1,12 @@
+cd $(dirname "${BASH_SOURCE[0]}../")
+
+if [[ `echo $TRAVIS_BRANCH` = "master" ]]; then
+	# Run basic and SauceLabs tests
+	echo "Running complete test suite..."
+	npm test || exit 1
+	npm run test-ci || exit 1
+else
+	# Run basic tests
+	echo "Running basic tests..."
+	npm test || exit 1
+fi