Permalink
Browse files

reverting express changes + fixing dependency version + fixing mocker…

…y credit
  • Loading branch information...
1 parent 87d01ab commit d02ddf7276131c4aad3551b76818500307677941 Pranav Verma committed Sep 18, 2012
Showing with 26 additions and 22 deletions.
  1. +4 −1 README.md
  2. +9 −8 arrow_server/server.js
  3. +1 −1 lib/session/sessionfactory.js
  4. +12 −12 package.json
View
@@ -82,8 +82,8 @@ arrow --controller=custom-controller.js --driver=selenium
##Arrow Dependencies
+NPM Dependencies
* **glob** https://github.com/isaacs/node-glob
-* **mockery** https://github.com/nathanmacinnes/Mockery
* **nopt** https://github.com/isaacs/nopt
* **colors** https://github.com/Marak/colors.js
* **express** https://github.com/visionmedia/express
@@ -92,6 +92,9 @@ arrow --controller=custom-controller.js --driver=selenium
* **log4js** https://github.com/nomiddlename/log4js-node
* **clone** https://github.com/pvorb/node-clone
* **useragent** https://github.com/3rd-Eden/useragent
+
+NPM Dev Dependencies
+* **mockery** https://github.com/mfncooper/mockery
* **ytestrunner** https://github.com/gotwarlost/ytestrunner
Apart from above mentioned npm modules, Arrow also relies on these two projects
@@ -3,10 +3,10 @@
/*jslint forin:true sub:true anon:true sloppy:true stupid:true nomen:true node:true continue:true*/
/*
-* Copyright (c) 2012, Yahoo! Inc. All rights reserved.
-* Copyrights licensed under the New BSD License.
-* See the accompanying LICENSE file for terms.
-*/
+ * Copyright (c) 2012, Yahoo! Inc. All rights reserved.
+ * Copyrights licensed under the New BSD License.
+ * See the accompanying LICENSE file for terms.
+ */
var fs = require("fs");
var os = require("os");
@@ -38,7 +38,7 @@ function showHelp() {
" --host : (optional) Fully qualified name of host where arrow server is running. (default: localhost)" + "\n" +
" --port : (optional) Arrow Server Port. (default: 4459) " + "\n" +
" --ghostPort : (optional) GhostDriver Port. (default: 4460) " + "\n\n"
- );
+ );
console.log("\nEXAMPLES :" + "\n" +
" For local usage: " + "\n" +
@@ -86,9 +86,10 @@ child.stderr.on("data", function (data) {
console.error(data.toString());
});
-var app = express();
-app.use(express.logger());
-app.use(express.cookieParser());
+var app = express.createServer(
+ express.logger(),
+ express.cookieParser()
+);
app.use(express.bodyParser());
var mimes = {
@@ -85,7 +85,7 @@ SessionFactory.prototype.runAllTestSessions = function () {
testSession = testQueue.sessions[testQueue.curIndex];
testQueue.curIndex += 1;
testSession.runTest(function () {
- self.logger.debug("Run Test :" + curSessionCount + "==" + totalSessionCount);
+ self.logger.trace("Run Test :" + curSessionCount + "==" + totalSessionCount);
curSessionCount += 1;
if (curSessionCount === totalSessionCount) {
self.logger.debug("Done with all the sessions");
View
@@ -1,7 +1,7 @@
{
"name": "yahoo-arrow",
"description": "FrontEnd Testing Framework",
- "version": "0.0.58",
+ "version": "0.0.59",
"homepage": "https://github.com/yahoo/arrow",
"repository": {
"type": "git",
@@ -31,18 +31,18 @@
},
"engines": [ "node >=0.6" ],
"dependencies": {
- "glob": "*",
- "nopt": "*",
- "colors":"*",
- "express":"*",
- "yui": "*",
- "JSV": "*",
- "log4js": "*",
- "clone": "*",
- "useragent": "*"
+ "glob": "3.1.11",
+ "nopt": "2.0.0",
+ "colors":"0.6.0-1",
+ "express":"2.5.2",
+ "yui": "3.6.0",
+ "JSV": "4.0.2",
+ "log4js": "0.5.1",
+ "clone": "0.1.0",
+ "useragent": "1.1.0"
},
"devDependencies": {
- "ytestrunner": "*",
- "mockery": "*"
+ "ytestrunner": "0.1.2",
+ "mockery": "1.1.2"
}
}

0 comments on commit d02ddf7

Please sign in to comment.