Merge remote-tracking branch 'upstream/svg' into bramp/svg

Author: StefRave

Makefile

@@ -40,25 +40,25 @@ test: dependencies build/sequence-diagram-min.js
 	$(NODE_MODULES)/qunit \
 		-c build/sequence-diagram.js \
 		-t test/*-tests.js \
-		-d test/snap-mock.js $(BOWER_COMPONENTS)/underscore/underscore-min.js
+		-d test/*-mock.js $(BOWER_COMPONENTS)/underscore/underscore-min.js
 
 	# Test the un-minifed file (with lodash)
 	$(NODE_MODULES)/qunit \
 		-c build/sequence-diagram.js \
 		-t test/*-tests.js \
-		-d test/snap-mock.js $(BOWER_COMPONENTS)/lodash/lodash.min.js
+		-d test/*-mock.js $(BOWER_COMPONENTS)/lodash/lodash.min.js
 
 	# Test the minifed file (with underscore)
 	$(NODE_MODULES)/qunit \
 		-c build/sequence-diagram-min.js \
 		-t test/*-tests.js \
-		-d test/snap-mock.js $(BOWER_COMPONENTS)/underscore/underscore-min.js
+		-d test/*-mock.js $(BOWER_COMPONENTS)/underscore/underscore-min.js
 
 	# Test the minifed file (with lodash)
 	$(NODE_MODULES)/qunit \
 		-c build/sequence-diagram-min.js \
 		-t test/*-tests.js \
-		-d test/snap-mock.js $(BOWER_COMPONENTS)/lodash/lodash.min.js
+		-d test/*-mock.js $(BOWER_COMPONENTS)/lodash/lodash.min.js
 
 build/grammar.js: src/grammar.jison
 	$(NODE_MODULES)/jison $< -o $@.tmp

test/snap-mock.js

@@ -2,9 +2,6 @@
 (function () {
 	"use strict";
 	this.Snap = {
-		// TODO
-		plugin: function(plug) {
-			plug(this.plugin, this.plugin, this.plugin, this.plugin, this.plugin);
-		}
-	}
+		plugin: function(){},
+	};
 }).call(this);