Merge pull request #17 from FormidableLabs/chore-misc-tweaks

Chore: More travis, misc tweaks.
FormidableLabs · Oct 19, 2015 · 9fdc0e3 · 9fdc0e3
2 parents 7ea9cb6 + aeba772
commit 9fdc0e3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -43,10 +43,16 @@ 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_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/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>

diff --git 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
@@ -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)