Performance: updating versions and configurations

Author: arschmitz

Gruntfile.js

@@ -100,9 +100,14 @@ var config = {
 					spawn: false
 				}
 			}
+		},
+		"stop-selenium-server": {
+			dev: {}
 		}
 	};
 
+// This loads files in the options folder as task options
+// and builds an object based on their file names
 function loadConfig(path) {
 	var glob = require( "glob" ),
 		object = {},
@@ -116,11 +121,18 @@ function loadConfig(path) {
 	return object;
 }
 
+// We no combine the loaded task options with the ones defined in config above
 grunt.util._.extend( config, loadConfig( "./tasks/options/" ) );
 
 grunt.initConfig( config );
+grunt.loadTasks( "tasks" );
 grunt.loadNpmTasks( "perfjankie" );
 grunt.registerTask( "default", [ "jshint", "jscs" ] );
 grunt.registerTask( "build", [ "sass", "autoprefixer" ] );
-grunt.registerTask( "perf", [ "start-selenium-server", "connect:perf", "perfjankie" ] );
+grunt.registerTask( "perf", [
+	"start-selenium-server",
+	"connect:perf",
+	"perfjankie",
+	"stop-selenium-server"
+]);
 };

package.json

@@ -41,8 +41,9 @@
     "test": "grunt"
   },
   "dependencies": {},
-  "devDependencies": {
-    "commitplease": "2.0.0",
+
+	"devDependencies": {
+    "browser-perf": "1.2.3",
     "chromedriver": "2.13.0",
 		"commitplease": "2.0.0",
     "ejs-template": "0.1.0",
@@ -60,7 +61,7 @@
     "grunt-svgmin": "^2.0.0",
     "grunt-svgstore": "^0.5.0",
     "load-grunt-tasks": "3.1.0",
-    "perfjankie": "1.1.1"
+    "perfjankie": "1.2.2"
 	},
 	"keywords": []
 }

tasks/options/connect.js

@@ -4,7 +4,7 @@ var template = require( "ejs-template" ),
 
 module.exports = {
 	options: {
-		port: 4300,
+		port: 4200,
 		base: ".",
 		middleware: [
 			template.middleware({ basedir: __dirname }),

tasks/options/perfjankie.js

@@ -5,8 +5,14 @@ module.exports = {
 	"comparison": {
 		options: {
 			repeat: 2,
-			selenium: "ondemand.saucelabs.com",
-			browsers: "chrome",
+			selenium: {
+				hostname: "localhost",
+				port: "4444"
+			},
+			browsers: [
+				"chrome",
+				"firefox"
+			],
 			couch: {
 				server: "http://localhost:5984",
 				database: "css-performance",

tasks/options/start-selenium-server.js

@@ -1,8 +1,8 @@
 module.exports = {
 	dev: {
 		options: {
-			downloadUrl: "https://selenium-release.storage.googleapis.com/2.40/" +
-				"selenium-server-standalone-2.40.0.jar",
+			downloadUrl: "https://selenium-release.storage.googleapis.com/2.45/" +
+				"selenium-server-standalone-2.45.0.jar",
 			downloadLocation: "external/selenium",
 			serverOptions: {
 				"Dwebdriver.chrome.driver=node_modules/chromedriver/bin/chromedriver": ""