Skip to content
This repository has been archived by the owner on Aug 5, 2020. It is now read-only.

Commit

Permalink
Update make test to use Phantomjs to run all tests and save the res…
Browse files Browse the repository at this point in the history
…ults as JUnit compatible XML.
  • Loading branch information
John Boxall committed Jun 14, 2012
1 parent 1a36e74 commit 6ee52d9
Show file tree
Hide file tree
Showing 14 changed files with 517 additions and 567 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
install:
npm install
npm install

test:
./tests/runner.sh
serve . && phantomjs tests/phantom.js

jenkins:
./tests/runner.sh
serve . && phantomjs tests/phantom.js | grep '<*>' | tee report.xml

all:
install
install
12 changes: 1 addition & 11 deletions api/combo-caching.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,6 @@ var ccPublic = /^\s*public\s*$/
}
}

//DEBUG
// console.log('urls: ' + JSON.stringify(urls));
// console.log('notCachedUrls: ' + JSON.stringify(notCachedUrls));

return notCachedUrls;
}

Expand Down Expand Up @@ -224,7 +220,6 @@ var ccPublic = /^\s*public\s*$/
}
}


/**
* asynchronously recursive function that attempts to whittle down a
* cache to a storeable size
Expand Down Expand Up @@ -367,9 +362,6 @@ var ccPublic = /^\s*public\s*$/
}
combo.rehydratedCache = true;

//DEBUG
console.log("rehydrateCache()")

var cacheContents = localStorage.getItem(cache.lsKey)
, key;

Expand Down Expand Up @@ -420,9 +412,7 @@ var ccPublic = /^\s*public\s*$/
// An exception is raised when localStorage is ful.
try {
localStorage.setItem(cache.lsKey, serialized);
console.log('storeCache()')
} catch(e) {
console.log('error');
setTimeout(function() {
evictAndStore(toBeCached, MAX_ATTEMPTS)
}, 0);
Expand All @@ -442,4 +432,4 @@ var ccPublic = /^\s*public\s*$/
}
};

})(Mobify);
})(Mobify);
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "The Mobify.js client side adaptation library.",
"author": "Mobify <dev@mobify.com>",
"devDependencies": {
"node-static": "0.5.8"
"serve": "*"
},
"engine": "node 0.6.2",
"repository" : {
Expand Down
Loading

0 comments on commit 6ee52d9

Please sign in to comment.