From 241f5b54707410246a536bfecd08503ce3b9338b Mon Sep 17 00:00:00 2001
From: Ryan Roemer <ryan.roemer@formidablelabs.com>
Date: Sun, 18 Oct 2015 16:40:50 -0700
Subject: [PATCH 1/2] More travis scenarios, doc fix.

---
 .travis.yml              | 4 ++++
 docs/shared-libraries.md | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 07c7080..509b370 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -43,8 +43,12 @@ script:
     '[ { "ROWDY_SETTINGS":"sauceLabs.IE_8_Windows_2008_Desktop" },
     { "ROWDY_SETTINGS":"sauceLabs.IE_9_Windows_2008_Desktop" },
     { "ROWDY_SETTINGS":"sauceLabs.IE_10_Windows_2012_Desktop" },
+    { "ROWDY_SETTINGS":"sauceLabs.safari_7_OS_X_10_9_Desktop" },
     { "ROWDY_SETTINGS":"sauceLabs.safari_8_OS_X_10_10_Desktop" },
     { "ROWDY_SETTINGS":"sauceLabs.chrome_43_OS_X_10_10_Desktop" },
+    { "ROWDY_SETTINGS":"sauceLabs.chrome_43_Windows_2012_R2_Desktop" },
+    { "ROWDY_SETTINGS":"sauceLabs.firefox_9_OS_X_10_9_Desktop" },
+    { "ROWDY_SETTINGS":"sauceLabs.firefox_9_Windows_2012_R2_Desktop" },
     { "ROWDY_SETTINGS":"local.firefox" } ]'
 
   # Manually send coverage reports to coveralls.
diff --git a/docs/shared-libraries.md b/docs/shared-libraries.md
index e7f691d..169771e 100644
--- a/docs/shared-libraries.md
+++ b/docs/shared-libraries.md
@@ -275,7 +275,7 @@ points:
 
 ```html
 <script src="webpack/lib.js"></script>
-<script src="../../../../node_modules/almond/almond.js"></script>
+<script src="almond.js"></script>
 <script src="requirepack/lib-interop.js"></script>
 <script src="requirejs/app1.js"></script>
 <script src="webpack/app2.js"></script>

From aeba7724604465600aaa82bc3544f42adce55dde Mon Sep 17 00:00:00 2001
From: Ryan Roemer <ryan.roemer@formidablelabs.com>
Date: Sun, 18 Oct 2015 20:18:48 -0700
Subject: [PATCH 2/2] Add various robustness tweaks for mocha.

---
 .travis.yml                 | 4 +++-
 test/func/mocha.opts        | 1 +
 test/func/spec/base.spec.js | 1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 509b370..393bb3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,10 +47,12 @@ script:
     { "ROWDY_SETTINGS":"sauceLabs.safari_8_OS_X_10_10_Desktop" },
     { "ROWDY_SETTINGS":"sauceLabs.chrome_43_OS_X_10_10_Desktop" },
     { "ROWDY_SETTINGS":"sauceLabs.chrome_43_Windows_2012_R2_Desktop" },
-    { "ROWDY_SETTINGS":"sauceLabs.firefox_9_OS_X_10_9_Desktop" },
     { "ROWDY_SETTINGS":"sauceLabs.firefox_9_Windows_2012_R2_Desktop" },
     { "ROWDY_SETTINGS":"local.firefox" } ]'
 
+  # Unreliable Sauce settings
+  # { "ROWDY_SETTINGS":"sauceLabs.firefox_9_OS_X_10_9_Desktop" },
+
   # Manually send coverage reports to coveralls.
   - ls  coverage/*/lcov.info | cat
   - cat coverage/*/lcov.info | ./node_modules/.bin/coveralls || echo "Coveralls upload failed"
diff --git a/test/func/mocha.opts b/test/func/mocha.opts
index 019bc6f..ffac5c6 100644
--- a/test/func/mocha.opts
+++ b/test/func/mocha.opts
@@ -1,3 +1,4 @@
 --require test/func/setup.js
 --recursive
 --timeout 25000
+--full-trace
diff --git a/test/func/spec/base.spec.js b/test/func/spec/base.spec.js
index da4ce34..bd5dcef 100644
--- a/test/func/spec/base.spec.js
+++ b/test/func/spec/base.spec.js
@@ -59,7 +59,6 @@ var ELEM_WAIT = isSauceLabs ? 5000 : 500; // Global wait.
 
 adapter.before();
 before(function (done) {
-  if (isSauceLabs) { this.timeout(20000); }
   adapter.client
     // Set timeout for waiting on elements.
     .timeoutsImplicitWait(ELEM_WAIT)