Merge branch 'master' into gh-pages

Author: jashkenas

.travis.yml

@@ -1,6 +1,4 @@
 language: node_js
-addons:
-  firefox: "10.0"
 node_js:
   - "0.8"
   - "0.12"
@@ -9,15 +7,26 @@ matrix:
   include:
     - node_js: "0.10"
       env: BROWSER=true
-env: BROWSER=false
 before_install:
   - npm install -g npm
-  - if [[ $BROWSER == true ]]; then npm install karma-phantomjs-launcher karma-firefox-launcher; fi
+  - npm install -g karma-cli
 before_script:
+  - npm install karma-sauce-launcher
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 script:
   - npm test
-  - "[ $BROWSER == false ] || ./node_modules/karma/bin/karma start --browsers Firefox,PhantomJS"
+  - "[ $BROWSER == false ] || npm run test-browser"
+  # Karma sauce is limited to running about 5-7 browsers (or it will tiemout) at a time so we just run vendor by vendor here
+  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers FIREFOX_V4,FIREFOX_V11,FIREFOX_V20,FIREFOX_V30,FIREFOX_V35"
+  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers CHROME_V28,CHROME_V35,CHROME_V40,ANDROID_V4.0,ANDROID_V4.3"
+  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers INTERNET_EXPLORER_V9,INTERNET_EXPLORER_V10,INTERNET_EXPLORER_V11"
+  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers SAFARI_V5,SAFARI_V6,SAFARI_V7"
+  - "[ $BROWSER == false ] || karma start karma.conf-sauce.js --browsers OPERA_V11,OPERA_V12"
 notifications:
   email: false
+env:
+  global:
+  - secure: bDZSBQfqr21hCayjcZ20IxrV6+XGhxQPFIfwWqEKLrF93Gu8LLVjZRxXE/mE8I8N4Z5WtDNb4ZHrm/TTzmcPa5MuHgIxEdknQCncobH8oimwc83SHwEPk6okeNKl39VlCjvvnmoe/V/KpnknuYn3Rqghtl/Uv9KLpCwskwjTtcw=
+  - secure: SRECgXuwcZTcD3GVxTS2bYNgRyye4vq6BLrV2PH9FyNenowsKQR2EwlC/dppc1Q8NWMgv79J/R96q9JOFh+mEH9L5dlBb2yhnGH8amVeM/ChAJHT/F8YktKM453uVpz5fR00QcCQDDUOx6Pvx374ID0OKNpWKAkQBWA9mPTsLnE=
+  matrix: BROWSER=false

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "underscore",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "main": "underscore.js",
   "keywords": ["util", "functional", "server", "client", "browser"],
   "ignore" : ["docs", "test", "*.yml", "CNAME", "index.html", "favicon.ico", "CONTRIBUTING.md"]

component.json

@@ -5,6 +5,6 @@
   "repo"          : "jashkenas/underscore",
   "main"          : "underscore.js",
   "scripts"       : ["underscore.js"],
-  "version"       : "1.8.1",
+  "version"       : "1.8.2",
   "license"       : "MIT"
 }

docs/underscore.html

@@ -180,7 +180,7 @@
   <div id="sidebar" class="interface">
 
     <a class="toc_title" href="#">
-      Underscore.js <span class="version">(1.8.1)</span>
+      Underscore.js <span class="version">(1.8.2)</span>
     </a>
     <ul class="toc_section">
       <li>&raquo; <a href="https://github.com/jashkenas/underscore">GitHub Repository</a></li>
@@ -282,7 +282,7 @@
       <li>- <a href="#object-functions">functions</a></li>
       <li>- <a href="#findKey">findKey</a></li>
       <li>- <a href="#extend">extend</a></li>
-      <li>- <a href="#assign">assign</a></li>
+      <li>- <a href="#extendOwn">extendOwn</a></li>
       <li>- <a href="#create">create</a></li>
       <li>- <a href="#pick">pick</a></li>
       <li>- <a href="#omit">omit</a></li>
@@ -403,13 +403,13 @@ <h2>Downloads <i style="padding-left: 12px; font-size:12px;">(Right-click, and u
 
     <table>
       <tr>
-        <td><a href="underscore.js">Development Version (1.8.1)</a></td>
-        <td><i>49kb, Uncompressed with Plentiful Comments</i></td>
+        <td><a href="underscore.js">Development Version (1.8.2)</a></td>
+        <td><i>51kb, Uncompressed with Plentiful Comments</i></td>
       </tr>
       <tr>
-        <td><a href="underscore-min.js">Production Version (1.8.1)</a></td>
+        <td><a href="underscore-min.js">Production Version (1.8.2)</a></td>
         <td>
-          <i>5.4kb, Minified and Gzipped</i>
+          <i>5.7kb, Minified and Gzipped</i>
           &nbsp;<small>(<a href="underscore-min.map">Source Map</a>)</small>
         </td>
       </tr>
@@ -619,11 +619,12 @@ <h2 id="collections">Collection Functions (Arrays or Objects)</h2>
 </pre>
 
       <p id="contains">
-        <b class="header">contains</b><code>_.contains(list, value)</code>
-        <span class="alias">Alias: <b>include</b></span>
+        <b class="header">contains</b><code>_.contains(list, value, [fromIndex])</code>
+        <span class="alias">Alias: <b>includes</b></span>
         <br />
         Returns <i>true</i> if the <b>value</b> is present in the <b>list</b>.
-        Uses <b>indexOf</b> internally, if <b>list</b> is an Array.
+        Uses <b>indexOf</b> internally, if <b>list</b> is an Array. 
+        Use <b>fromIndex</b> to start your search at a given index.
       </p>
       <pre>
 _.contains([1, 2, 3], 3);
@@ -1378,7 +1379,7 @@ <h2 id="objects">Object Functions</h2>
 _.mapObject({start: 5, end: 12}, function(val, key) {
   return val + 5;
 });
-=&gt; {start: 10, b: 17}
+=&gt; {start: 10, end: 17}
 </pre>
 
       <p id="pairs">
@@ -1438,6 +1439,7 @@ <h2 id="objects">Object Functions</h2>
 
       <p id="extendOwn">
         <b class="header">extendOwn</b><code>_.extendOwn(destination, *sources)</code>
+        <span class="alias">Alias: <b>assign</b></span>
         <br />
         Like <b>extend</b>, but only copies <i>own</i> properties over to the 
         destination object.
@@ -2191,13 +2193,26 @@ <h2 id="links">Links &amp; Suggested Reading</h2>
 
       <h2 id="changelog">Change Log</h2>
 
+      <p id="1.8.2">
+        <b class="header">1.8.2</b> &mdash; <small><i>Feb. 22, 2015</i></small> &mdash; <a href="https://github.com/jashkenas/underscore/compare/1.8.1...1.8.2">Diff</a> &mdash; <a href="https://cdn.rawgit.com/jashkenas/underscore/1.8.2/index.html">Docs</a><br />
+        <ul>
+          <li>
+            Restores the previous old-Internet-Explorer edge cases changed in 
+            1.8.1.
+          </li>
+          <li>
+            Adds a <tt>fromIndex</tt> argument to <tt>_.contains</tt>.
+          </li>
+        </ul>
+      </p>
+
       <p id="1.8.1">
         <b class="header">1.8.1</b> &mdash; <small><i>Feb. 19, 2015</i></small> &mdash; <a href="https://github.com/jashkenas/underscore/compare/1.8.0...1.8.1">Diff</a> &mdash; <a href="https://cdn.rawgit.com/jashkenas/underscore/1.8.1/index.html">Docs</a><br />
         <ul>
           <li>
-            Fixes/changes some old-Internet-Explorer and related edge case 
+            Fixes/changes some old-Internet Explorer and related edge case 
             behavior. Test your app with Underscore 1.8.1 in an old IE and let
-            us know how its doing...
+            us know how it's doing...
           </li>
         </ul>
       </p>

index.html

@@ -0,0 +1,82 @@
+var _ = require('./');
+
+// Browsers to run on Sauce Labs platforms
+var sauceBrowsers = _.reduce([
+  ['firefox', '35'],
+  ['firefox', '30'],
+  ['firefox', '20'],
+  ['firefox', '11'],
+  ['firefox', '4'],
+
+  ['chrome', '40'],
+  ['chrome', '35'],
+  ['chrome', '28'],
+
+  ['internet explorer', '11', 'Windows 8.1'],
+  ['internet explorer', '10', 'Windows 8'],
+  ['internet explorer', '9', 'Windows 7'],
+  // Currently do not work with Karma.
+  // ['internet explorer', '8', 'Windows 7'],
+  // ['internet explorer', '7', 'Windows XP'],
+  // ['internet explorer', '6', 'Windows XP'],
+
+  ['opera', '12'],
+  ['opera', '11'],
+
+  ['android', '4.3'],
+  ['android', '4.0'],
+
+  ['safari', '8'],
+  ['safari', '6'],
+  ['safari', '7'],
+  ['safari', '5']
+], function(memo, platform) {
+  var label = (platform[0] + '_v' + platform[1]).replace(' ', '_').toUpperCase();
+  memo[label] = _.pick({
+    'base': 'SauceLabs',
+    'browserName': platform[0],
+    'version': platform[1],
+    'platform': platform[2]
+  }, Boolean);
+  return memo;
+}, {});
+
+module.exports = function(config) {
+  if ( !process.env.SAUCE_USERNAME || !process.env.SAUCE_ACCESS_KEY ) {
+    console.log('Sauce environments not set --- Skipping');
+    return process.exit(0);
+  }
+
+  config.set({
+    basePath: '',
+    frameworks: ['qunit'],
+    singleRun: true,
+
+    // list of files / patterns to load in the browser
+    files: [
+      'test/vendor/qunit-extras.js',
+      'underscore.js',
+      'test/*.js'
+    ],
+    // test results reporter to use
+    reporters: ['dots', 'saucelabs'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    sauceLabs: {
+      build: 'TRAVIS #' + process.env.TRAVIS_BUILD_NUMBER + ' (' + process.env.TRAVIS_BUILD_ID + ')',
+      startConnect: true,
+      tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER
+    },
+
+    // TODO(vojta): remove once SauceLabs supports websockets.
+    // This speeds up the capturing a bit, as browsers don't even try to use websocket.
+    transports: ['xhr-polling'],
+    captureTimeout: 120000,
+    customLaunchers: sauceBrowsers
+
+    // Browsers to launch, commented out to prevent karma from starting
+    // too many concurrent browsers and timing sauce out.
+    // browsers: _.keys(sauceBrowsers)
+  });
+};

karma.conf-sauce.js

@@ -1,36 +1,28 @@
 // Note some browser launchers should be installed before using karma start.
+
 // For example:
-// npm install karma-firefox-launcher
-// karma start --browser=Firefox
+//      $ npm install karma-firefox-launcher
+//      $ karma start --browser=Firefox
+
+// See http://karma-runner.github.io/0.8/config/configuration-file.html
 module.exports = function(config) {
   config.set({
     basePath: '',
     frameworks: ['qunit'],
+    logLevel: config.LOG_INFO,
+    port: 9876,
 
     // list of files / patterns to load in the browser
     files: [
+      'test/vendor/qunit-extras.js',
       'underscore.js',
       'test/*.js'
     ],
 
-    // test results reporter to use
-    // possible values: 'dots', 'progress'
-    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    // Test results reporter to use
+    // https://npmjs.org/browse/keyword/karma-reporter
     reporters: ['progress'],
 
-    // web server port
-    port: 9876,
-
-    // enable / disable colors in the output (reporters and logs)
-    colors: true,
-
-    // level of logging
-    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
-    logLevel: config.LOG_INFO,
-
-    // enable / disable watching file and executing tests whenever any file changes
-    autoWatch: false,
-
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
     browsers: ['PhantomJS'],

karma.conf.js

@@ -15,9 +15,9 @@
     "url": "git://github.com/jashkenas/underscore.git"
   },
   "main": "underscore.js",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "devDependencies": {
-    "docco": "0.6.x",
+    "docco": "*",
     "eslint": "0.6.x",
     "karma": "~0.12.31",
     "karma-qunit": "~0.1.4",

package.json

@@ -418,6 +418,14 @@
 
   test('contains', function() {
     strictEqual(_.includes, _.contains, 'alias for includes');
+
+    var numbers = [1, 2, 3, 1, 2, 3, 1, 2, 3];
+    strictEqual(_.includes(numbers, 1, 1), true);
+    strictEqual(_.includes(numbers, 1, -1), false);
+    strictEqual(_.includes(numbers, 1, -2), false);
+    strictEqual(_.includes(numbers, 1, -3), true);
+    strictEqual(_.includes(numbers, 1, 6), true);
+    strictEqual(_.includes(numbers, 1, 7), false);
   });
 
   test('includes with NaN', function() {

test/collections.js

@@ -2,6 +2,7 @@
   var _ = typeof require == 'function' ? require('..') : window._;
 
   QUnit.module('Functions');
+  QUnit.config.asyncRetries = 3;
 
   test('bind', function() {
     var context = {name : 'moe'};