From 98e8289c9ba9f1796bdbff45a582f8487c182ce4 Mon Sep 17 00:00:00 2001
From: Ian Gilman <ian@iangilman.com>
Date: Thu, 21 Feb 2013 11:17:05 -0800
Subject: [PATCH] Test now works again
---
Gruntfile.js | 14 ++++++++++----
package.json | 2 --
test/test.html | 4 ++--
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/Gruntfile.js b/Gruntfile.js
index 84022eb5..b445f6af 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -71,12 +71,18 @@ module.exports = function(grunt) {
}
},
qunit: {
- all: [ "http://localhost:8000/test/test.html" ]
+ all: {
+ options: {
+ urls: [ "http://localhost:8000/test/test.html" ]
+ }
+ }
},
connect: {
- options: {
- port: 8000,
- base: "."
+ server: {
+ options: {
+ port: 8000,
+ base: "."
+ }
}
},
watch: {
diff --git a/package.json b/package.json
index b8fe582d..2daf64b9 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,6 @@
"description": "Provides a smooth, zoomable user interface for HTML/Javascript.",
"dependencies": {
"grunt": "~0.4.0",
- "qunitjs": "1.11.0",
- "phantomjs": "1.8.1-3",
"grunt-contrib-compress": "~0.4.0",
"grunt-contrib-concat": "~0.1.2",
"grunt-contrib-jshint": "~0.1.1",
diff --git a/test/test.html b/test/test.html
index feb73d22..e7e20a45 100644
--- a/test/test.html
+++ b/test/test.html
@@ -3,14 +3,14 @@
<head>
<meta charset="utf-8">
<title>OpenSeadragon QUnit</title>
- <link rel="stylesheet" href="/node_modules/qunitjs/qunit/qunit.css">
+ <link rel="stylesheet" href="/node_modules/grunt-contrib-qunit/test/libs/qunit.css">
<link rel="stylesheet" href="/test/test.css">
</head>
<body>
<div id="qunit"></div>
<div id="qunit-fixture"></div>
<div id="example"></div>
- <script src="/node_modules/qunitjs/qunit/qunit.js"></script>
+ <script src="/node_modules/grunt-contrib-qunit/test/libs/qunit.js"></script>
<script src="/build/openseadragon.min.js"></script>
<script src="/test/test.js"></script>
</body>