You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ch...@apache.org on 2013/06/18 02:27:23 UTC
git commit: updated refs/heads/fauxton-jasmine to d2ff6d2
Updated Branches:
refs/heads/fauxton-jasmine [created] d2ff6d21e
Experiments with Jasmine testing
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/d2ff6d21
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/d2ff6d21
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/d2ff6d21
Branch: refs/heads/fauxton-jasmine
Commit: d2ff6d21e92bb8b8e562b89fe4cc2bbd83c8b627
Parents: cbbd7d5
Author: Russell Branca <ch...@gmail.com>
Authored: Mon Jun 17 17:27:21 2013 -0700
Committer: Russell Branca <ch...@gmail.com>
Committed: Mon Jun 17 17:27:21 2013 -0700
----------------------------------------------------------------------
src/fauxton/Gruntfile.js | 14 +++++++++++++-
src/fauxton/package.json | 4 +++-
src/fauxton/test/jasmine/spec/example.js | 2 +-
3 files changed, 17 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d2ff6d21/src/fauxton/Gruntfile.js
----------------------------------------------------------------------
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index b76ae24..6d5ce88 100644
--- a/src/fauxton/Gruntfile.js
+++ b/src/fauxton/Gruntfile.js
@@ -238,8 +238,18 @@ module.exports = function(grunt) {
// The headless Jasmine testing is provided by grunt-jasmine-task. Simply
// point the configuration to your test directory.
+ // jasmine: {
+ // all: ["test/jasmine/*.html"]
+ //},
+
jasmine: {
- all: ["test/jasmine/*.html"]
+ fauxton: {
+ //src: 'app/**/*.js',
+ options: {
+ specs: 'test/jasmine/spec/*.js'
+ //helpers: 'spec/*Helper.js'
+ }
+ }
},
// Copy build artifacts and library code into the distribution
@@ -311,6 +321,8 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-uglify');
// Load CSSMin task
grunt.loadNpmTasks('grunt-contrib-cssmin');
+ // Load Jasmine task
+ grunt.loadNpmTasks('grunt-contrib-jasmine');
/*
* Default task
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d2ff6d21/src/fauxton/package.json
----------------------------------------------------------------------
diff --git a/src/fauxton/package.json b/src/fauxton/package.json
index 5b63675..1f914c2 100644
--- a/src/fauxton/package.json
+++ b/src/fauxton/package.json
@@ -25,7 +25,9 @@
"express": "~3.0.6",
"http-proxy": "~0.10.2"
},
- "devDependencies": {},
+ "devDependencies": {
+ "grunt-contrib-jasmine": "~0.5.0"
+ },
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
http://git-wip-us.apache.org/repos/asf/couchdb/blob/d2ff6d21/src/fauxton/test/jasmine/spec/example.js
----------------------------------------------------------------------
diff --git a/src/fauxton/test/jasmine/spec/example.js b/src/fauxton/test/jasmine/spec/example.js
index bbba3e8..f56f6e9 100644
--- a/src/fauxton/test/jasmine/spec/example.js
+++ b/src/fauxton/test/jasmine/spec/example.js
@@ -68,6 +68,6 @@ describe("async", function() {
semaphore--;
}, 500);
- waitsFor(function() { return semaphore === 0 });
+ waitsFor(function() { return semaphore === 0; });
});
});