Merge remote-tracking branch 'upstream/master'

CHANGELOG.md

@@ -1,3 +1,17 @@
+<a name="1.1.2"></a>
+## [1.1.2](https://github.com/karma-runner/karma/compare/v1.1.1...v1.1.2) (2016-07-26)
+
+
+### Bug Fixes
+
+* Merge config child nodes on config.set() ([65b688a](https://github.com/karma-runner/karma/commit/65b688a))
+* **context:** Updated postMessage listener to stop validating non-Karma messages ([306e565](https://github.com/karma-runner/karma/commit/306e565))
+* **docs:** fix stopper.stop wrong variable name. closes [#2244](https://github.com/karma-runner/karma/issues/2244) ([0745a00](https://github.com/karma-runner/karma/commit/0745a00)), closes [#2244](https://github.com/karma-runner/karma/issues/2244)
+* **file-list:** ensure patterns are comparable ([4d1bf3e](https://github.com/karma-runner/karma/commit/4d1bf3e)), closes [#2194](https://github.com/karma-runner/karma/issues/2194)
+* **middleware:** fix WARN log when passing undefined error handler to promise.then ([20b87de](https://github.com/karma-runner/karma/commit/20b87de)), closes [#2227](https://github.com/karma-runner/karma/issues/2227)
+
+
+
 <a name="1.1.1"></a>
 ## [1.1.1](https://github.com/karma-runner/karma/compare/v1.1.0...v1.1.1) (2016-07-07)
 

client/karma.js

@@ -35,12 +35,14 @@ var Karma = function (socket, iframe, opener, navigator, location) {
       }
 
       // Take action based on the message type
-      var method = evt.data.method
-      if (!self[method]) {
-        self.error('Received `postMessage` for "' + method + '" but the method doesn\'t exist')
-        return
+      var method = evt.data.__karmaMethod
+      if (method) {
+        if (!self[method]) {
+          self.error('Received `postMessage` for "' + method + '" but the method doesn\'t exist')
+          return
+        }
+        self[method].apply(self, evt.data.__karmaArguments)
       }
-      self[method].apply(self, evt.data.arguments)
     }, false)
   }
 

context/karma.js

@@ -130,7 +130,7 @@ ContextKarma.getDirectCallParentKarmaMethod = function (parentWindow) {
 }
 ContextKarma.getPostMessageCallParentKarmaMethod = function (parentWindow) {
   return function postMessageCallParentKarmaMethod (method, args) {
-    parentWindow.postMessage({method: method, arguments: args}, window.location.origin)
+    parentWindow.postMessage({__karmaMethod: method, __karmaArguments: args}, window.location.origin)
   }
 }
 

lib/file-list.js

@@ -20,6 +20,7 @@ var File = require('./file')
 var Url = require('./url')
 var helper = require('./helper')
 var log = require('./logger').create('watcher')
+var createPatternObject = require('./config').createPatternObject
 
 // Constants
 // ---------
@@ -230,6 +231,13 @@ Object.defineProperty(List.prototype, 'files', {
     var lookup = {}
     var included = {}
     this._patterns.forEach(function (p) {
+      // This needs to be here sadly, as plugins are modifiying
+      // the _patterns directly resulting in elements not being
+      // instantiated properly
+      if (p.constructor.name !== 'Pattern') {
+        p = createPatternObject(p)
+      }
+
       var bucket = expandPattern(p)
       bucket.forEach(function (file) {
         var other = lookup[file.path]

package.json

@@ -31,73 +31,73 @@
     "Christian Budde Christensen <budde377@gmail.com>",
     "taichi <ryushi@gmail.com>",
     "Liam Newman <bitwiseman@gmail.com>",
-    "Ciro Nunes <ciroanunes@gmail.com>",
     "Todd Wolfson <todd@twolfson.com>",
-    "Tim Cuthbertson <tim@gfxmonk.net>",
+    "Ciro Nunes <ciroanunes@gmail.com>",
     "Pawel Kozlowski <pkozlowski.opensource@gmail.com>",
+    "Tim Cuthbertson <tim@gfxmonk.net>",
+    "Christian Budde Christensen <christi@n-bud.de>",
     "Mark Trostler <mark@zzo.com>",
     "Robo <hop2deep@gmail.com>",
-    "Christian Budde Christensen <christi@n-bud.de>",
     "Shyam Seshadri <shyamseshadri@gmail.com>",
-    "Mark Ethan Trostler <mark@zzo.com>",
     "Mourad <mourad@elmaouchi.com>",
+    "Mark Ethan Trostler <mark@zzo.com>",
     "joshjb84 <joshjb84@hotmail.com>",
-    "Michał Gołębiowski <m.goleb@gmail.com>",
     "Kim Joar Bekkelund <kjbekkelund@gmail.com>",
+    "Michał Gołębiowski <m.goleb@gmail.com>",
     "Nick Malaguti <nmalaguti@palantir.com>",
     "Andrew Martin <sublimino@gmail.com>",
-    "Jérémy Judéaux <jeremy.judeaux@volune.net>",
-    "pavelgj <pavelgj@gmail.com>",
-    "Brian Ford <btford@umich.edu>",
-    "sylvain-hamel <sylvainhamel0@gmail.com>",
     "Marcello Nuccio <marcello.nuccio@gmail.com>",
-    "Jeff Jewiss <jeffjewiss@gmail.com>",
-    "Daniel Compton <desk@danielcompton.net>",
-    "Daniel Aleksandersen <code@daniel.priv.no>",
+    "Jérémy Judéaux <jeremy.judeaux@volune.net>",
     "Iristyle <Iristyle@github>",
+    "Daniel Compton <desk@danielcompton.net>",
+    "Jeff Jewiss <jeffjewiss@gmail.com>",
+    "Brian Ford <btford@umich.edu>",
     "Ilya Volodin <ivolodin@vistaprint.com>",
     "David Souther <davidsouther@gmail.com>",
+    "Daniel Aleksandersen <code@daniel.priv.no>",
+    "pavelgj <pavelgj@gmail.com>",
+    "sylvain-hamel <sylvainhamel0@gmail.com>",
     "Aymeric Beaumet <aymeric@beaumet.me>",
     "Sammy Jelin <sjelin@gmail.com>",
+    "ngiebel <ngiebel@starkinvestments.com>",
     "rdodev <rubenoz@gmail.com>",
     "Greenkeeper <support@greenkeeper.io>",
-    "comdiv <fagim.sadykov@gmail.com>",
+    "Jonas Pommerening <jonas.pommerening@aixigo.de>",
     "Aseem Bansal <aseembansal@live.com>",
     "Jonathan Freeman <freethejazz@gmail.com>",
     "Shane Russell <shane1337@gmail.com>",
     "Stefan Dragnev <dragnev@telerik.com>",
+    "KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>",
     "Steve Mao <maochenyan@gmail.com>",
     "Steve Mao <steve.mao@healthinteract.com.au>",
-    "KJ Tsanaktsidis <kjtsanaktsidis@gmail.com>",
     "Sylvain Hamel <sylvainhamel0@gmail.com>",
     "Hugues Malphettes <hmalphettes@gmail.com>",
     "ChangZhuo Chen (陳昌倬) <czchen@gmail.com>",
-    "Thomas Parisot <thomas@oncle-tom.net>",
     "Igor Minar <igor@angularjs.org>",
+    "Thomas Parisot <thomas@oncle-tom.net>",
     "Igor Minar <iiminar@gmail.com>",
     "Tom Erik Støwer <tomerik@getkahoot.com>",
     "Kevin WENNER <kevin.wenner@massmotionmedia.com>",
     "Parashuram <code@r.nparashuram.com>",
     "Pat Tullmann <pt@bebop.co>",
     "Vladimir Starkov <iamstarkov@users.noreply.github.com>",
     "Luke Page <luke.a.page@gmail.com>",
-    "Wesley Cho <wesley.cho@gmail.com>",
     "PatrickJS <github@gdi2290.com>",
+    "Wesley Cho <wesley.cho@gmail.com>",
     "DarthCharles <carlos.darth@gmail.com>",
     "Bryan Smith <bryanrsmith@gmail.com>",
     "James Ford <jford@psyked.co.uk>",
-    "Jonas Pommerening <jonas.pommerening@aixigo.de>",
     "Ethan J. Brown <ethan_j_brown@hotmail.com>",
+    "comdiv <fagim.sadykov@gmail.com>",
     "Richard Harrington <rwharrington87@gmail.com>",
     "James Talmage <james@talmage.io>",
     "Roarke Gaskill <roarke.gaskill@gmail.com>",
     "David Pärsson <david@parsson.se>",
+    "Robin Liang <robin.gnail@gmail.com>",
     "Ruben Bridgewater <ruben.bridgewater@fintura.de>",
     "johnjbarton <johnjbarton@johnjbarton.com>",
     "karmarunnerbot <karmarunnerbot@gmail.com>",
     "Bulat Shakirzyanov <mallluhuct@gmail.com>",
-    "ngiebel <ngiebel@starkinvestments.com>",
-    "Karl Lindmark <karl.lindmark@ninetwozero.com>",
     "Karol Fabjańczuk <karol.fabjanczuk@lemondemon.pl>",
     "Karolis Narkevicius <karolis.n@gmail.com>",
     "Keats <balthek@gmail.com>",
@@ -162,6 +162,7 @@
     "Sergey Kruk <sergey.kruk@gmail.com>",
     "Sergey Simonchik <sergey.simonchik@jetbrains.com>",
     "Seth Rhodes <seth@thinkpixbit.com>",
+    "Shahar Mor <shaharmor1@gmail.com>",
     "Shane Osbourne <shane.osbourne8@gmail.com>",
     "Simen Bekkhus <sbekkhus91@gmail.com>",
     "Simone Gentili <sensorario@gmail.com>",
@@ -185,6 +186,7 @@
     "Volune <jeremy.judeaux@volune.net>",
     "Vova Bilonenko <bilonenko.v@gmail.com>",
     "Wizek <123.wizek@gmail.com>",
+    "Yaniv Efraim <yaniv.efraim@gmail.com>",
     "Yi Wang <e@yi-wang.me>",
     "Yvonne Yip <ykyyip@google.com>",
     "Zhang zhengzheng <code@tychio.net>",
@@ -284,7 +286,8 @@
     "Jon Bretman <jon.bretman@gmail.com>",
     "Jonathan ES Lin <ernsheong@gmail.com>",
     "Julian Connor <julian.connor@venmo.com>",
-    "Jurko Gospodnetić <jurko.gospodnetic@pke.hr>"
+    "Jurko Gospodnetić <jurko.gospodnetic@pke.hr>",
+    "Karl Lindmark <karl.lindmark@ninetwozero.com>"
   ],
   "dependencies": {
     "bluebird": "^3.3.0",
@@ -387,7 +390,7 @@
   "engines": {
     "node": "0.10 || 0.12 || 4 || 5 || 6"
   },
-  "version": "1.1.1",
+  "version": "1.1.2",
   "license": "MIT",
   "scripts": {
     "lint": "grunt lint",