From 2ebe67f110df0a4d58d116f2113c4612042f5c21 Mon Sep 17 00:00:00 2001
From: Vladimir Agafonkin <agafonkin@gmail.com>
Date: Thu, 31 Jan 2013 15:44:55 +0200
Subject: [PATCH] cleanup testacular config

---
 spec/after.js              |  2 ++
 spec/before.js             |  3 ++
 spec/beforeTestsContext.js |  1 -
 spec/context.js            |  3 --
 spec/testacular.conf.js    | 66 ++++++++++++++++----------------------
 5 files changed, 33 insertions(+), 42 deletions(-)
 create mode 100644 spec/after.js
 create mode 100644 spec/before.js
 delete mode 100644 spec/beforeTestsContext.js
 delete mode 100644 spec/context.js

diff --git a/spec/after.js b/spec/after.js
new file mode 100644
index 00000000..7dcd1d9b
--- /dev/null
+++ b/spec/after.js
@@ -0,0 +1,2 @@
+// put after Leaflet files as imagePath can't be detected in a PhantomJS env
+L.Icon.Default.imagePath = "../dist/images";
diff --git a/spec/before.js b/spec/before.js
new file mode 100644
index 00000000..ef0ea0f4
--- /dev/null
+++ b/spec/before.js
@@ -0,0 +1,3 @@
+// set up before Leaflet files to test L#noConflict later
+L = 'test';
+
diff --git a/spec/beforeTestsContext.js b/spec/beforeTestsContext.js
deleted file mode 100644
index fa3efe8b..00000000
--- a/spec/beforeTestsContext.js
+++ /dev/null
@@ -1 +0,0 @@
-L.Icon.Default.imagePath = "http://leafletjs.com/dist/images/marker-icon@2x.png";
diff --git a/spec/context.js b/spec/context.js
deleted file mode 100644
index 1635b7e5..00000000
--- a/spec/context.js
+++ /dev/null
@@ -1,3 +0,0 @@
-// set up context before tests
-L = 'test'; //to test L#noConflict later
-
diff --git a/spec/testacular.conf.js b/spec/testacular.conf.js
index 32c28781..9137f4d9 100644
--- a/spec/testacular.conf.js
+++ b/spec/testacular.conf.js
@@ -1,5 +1,5 @@
 // Testacular configuration
-// Generated on Sat Jan 19 2013 16:24:31 GMT-0200 (BRST)
+
 var libSources = require(__dirname+'/../build/build.js').getFiles();
 
 // base path, that will be used to resolve files and exclude
@@ -11,65 +11,57 @@ for (var i=0; i < libSources.length; i++) {
 
 // list of files / patterns to load in the browser
 files = [].concat([
-  JASMINE,
-  JASMINE_ADAPTER,
-	"happen.js",
-	"context.js"],
-	libSources,
-	["beforeTestsContext.js",
-	"suites/SpecHelper.js",
-	"suites/LeafletSpec.js",
-	"suites/control/Control.LayersSpec.js",
-	"suites/control/Control.ScaleSpec.js",
-	"suites/core/UtilSpec.js",
-	"suites/core/ClassSpec.js",
-	"suites/core/EventsSpec.js",
-	"suites/geometry/PointSpec.js",
-	"suites/geometry/BoundsSpec.js",
-	"suites/geometry/TransformationSpec.js",
-	"suites/geo/LatLngSpec.js",
-	"suites/geo/LatLngBoundsSpec.js",
-	"suites/geo/ProjectionSpec.js",
-	"suites/dom/DomEventSpec.js",
-	"suites/dom/DomUtilSpec.js",
-	"suites/layer/TileLayerSpec.js",
-	"suites/layer/vector/PolylineGeometrySpec.js",
-	"suites/layer/vector/CircleSpec.js",
-	"suites/map/MapSpec.js"
-]);
+		JASMINE,
+		JASMINE_ADAPTER,
+		"before.js"
+	], libSources, [
+		"after.js",
+		"happen.js",
+		"suites/SpecHelper.js",
+		"suites/LeafletSpec.js",
+		"suites/control/Control.LayersSpec.js",
+		"suites/control/Control.ScaleSpec.js",
+		"suites/core/UtilSpec.js",
+		"suites/core/ClassSpec.js",
+		"suites/core/EventsSpec.js",
+		"suites/geometry/PointSpec.js",
+		"suites/geometry/BoundsSpec.js",
+		"suites/geometry/TransformationSpec.js",
+		"suites/geo/LatLngSpec.js",
+		"suites/geo/LatLngBoundsSpec.js",
+		"suites/geo/ProjectionSpec.js",
+		"suites/dom/DomEventSpec.js",
+		"suites/dom/DomUtilSpec.js",
+		"suites/layer/TileLayerSpec.js",
+		"suites/layer/vector/PolylineGeometrySpec.js",
+		"suites/layer/vector/CircleSpec.js",
+		"suites/map/MapSpec.js"
+	]);
 
 // list of files to exclude
-exclude = [
-  
+exclude = [  
 ];
 
-
 // test results reporter to use
 // possible values: 'dots', 'progress', 'junit'
 reporters = ['dots'];
 
-
 // web server port
 port = 8080;
 
-
 // cli runner port
 runnerPort = 9100;
 
-
 // enable / disable colors in the output (reporters and logs)
 colors = true;
 
-
 // level of logging
 // possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
 logLevel = LOG_INFO;
 
-
 // enable / disable watching file and executing tests whenever any file changes
 autoWatch = false;
 
-
 // Start these browsers, currently available:
 // - Chrome
 // - ChromeCanary
@@ -80,11 +72,9 @@ autoWatch = false;
 // - IE (only Windows)
 browsers = ['PhantomJS'];
 
-
 // If browser does not capture in given timeout [ms], kill it
 captureTimeout = 5000;
 
-
 // Continuous Integration mode
 // if true, it capture browsers, run tests and exit
 singleRun = true;