PR Synch

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
   - 0.8
-  - 0.10.1
+  - 0.10.33
 before_install:
   - npm conf set strict-ssl false

CHANGELOG.md

@@ -1,5 +1,97 @@
 # Change Log
 
+# 0.6.16
+ * Fixing usage of cookie-parser and body-parser  [PR](https://github.com/yahoo/arrow/pull/291)
+
+# 0.6.15
+ * Adding cookie-parser and body-parser dependencies [PR](https://github.com/yahoo/arrow/pull/290)
+
+# 0.6.14
+ * Updating shrinkwrap for Express update [PR](https://github.com/yahoo/arrow/pull/289)
+
+# 0.6.13
+
+ * Updating Express to 4.x [PR](https://github.com/yahoo/arrow/pull/287)
+
+# 0.6.12
+
+ * Adding support for passing sauce tunnel in capabilities [PR](https://github.com/yahoo/arrow/pull/285)
+
+# 0.6.11
+
+ * Adding support for passing sauce username and accesskey in capabilities [PR](https://github.com/yahoo/arrow/pull/284)
+
+# 0.6.10
+
+ * Update sauce labs dashboard with test results [PR](https://github.com/yahoo/arrow/pull/282)
+
+# 0.6.9
+
+ * Adding support to show sauce labs report url in report [PR](https://github.com/yahoo/arrow/pull/278)
+
+# 0.6.8
+
+ * Updating capabilities for iOS [PR](https://github.com/yahoo/arrow/pull/275)
+
+# 0.6.7
+
+ * Add the capacity to record POST body and access it from proxy manager's record [PR](https://github.com/yahoo/arrow/pull/271)
+
+# 0.6.6
+
+ * Fix for screenshots getting overwritten if there are multiple test failures in one descriptor [PR](https://github.com/yahoo/arrow/pull/270) [Issue](https://github.com/yahoo/arrow/issues/269)
+
+# 0.6.5
+
+ * Fix for supporting context with datadriven descriptors and fixing shrinkwrap [PR](https://github.com/yahoo/arrow/pull/267)
+
+# 0.6.4
+
+ * Setting rejectUnauthorized to false for webservice controller [PR](https://github.com/yahoo/arrow/pull/266)
+ * Setting express version to 3.x and Mocha to ~1.18.2 [PR](https://github.com/yahoo/arrow/pull/252)
+
+# 0.6.3
+
+ * Fix to avoid ECONNRESET issue with Nodejs 10 [PR](https://github.com/yahoo/arrow/pull/250)
+
+# 0.6.2
+
+ * Restarting phantomjs before retry, if it crashed while test execution [PR](https://github.com/yahoo/arrow/pull/243) [Issue](https://github.com/yahoo/arrow/issues/240)
+ * Add additional checks for markup-test.js [PR](https://github.com/yahoo/arrow/pull/244)
+
+# 0.6.1
+
+ * Fix for exitCode not working for unit tests [PR](https://github.com/yahoo/arrow/pull/239)
+ * Fixing condition for descriptorSharedParams [PR](https://github.com/yahoo/arrow/pull/238)
+
+# 0.6.0
+
+ * Adding support for data driven descriptors [PR](https://github.com/yahoo/arrow/pull/237) [Documentation](http://yahoo.github.io/arrow/arrow_FAQs.html#how-can-I-reuse-same-descriptor-with-different-sets-of-data)
+ * Adding support for sharing parameters from descriptors [PR](https://github.com/yahoo/arrow/pull/237) [Documentation](http://yahoo.github.io/arrow/arrow_FAQs.html#how-can-I-share-params-from-my-descriptor)
+ * Error handling for JSON parsing in webservice controller [PR](https://github.com/yahoo/arrow/pull/235)
+
+# 0.5.3
+
+ * Adding support for specifying comments in descriptor [PR](https://github.com/yahoo/arrow/pull/232)
+ * Making nodejs tests honor logLevel [PR](https://github.com/yahoo/arrow/pull/232)
+ * Fixed the issue - space after a comma in the 'commonLib' string in 'test-descriptor.json' causes a fail [Issue](https://github.com/yahoo/arrow/issues/206) [PR](https://github.com/yahoo/arrow/pull/233)
+
+# 0.5.2
+
+ * Using cdnjs link for yui [PR](https://github.com/yahoo/arrow/pull/228)
+ * Adding support to pass capabilities as JSON object, merging default capabilities with user defined capabilities [PR](https://github.com/yahoo/arrow/pull/227)
+
+# 0.5.1
+
+ * Adding support for Android browser [PR](https://github.com/yahoo/arrow/pull/219)
+ * Adding support to resize the browser window [PR](https://github.com/yahoo/arrow/pull/205)
+ * Fixing the issue - Error: EMFILE, too many open files 'node/proxy.log  [Issue](https://github.com/yahoo/arrow/issues/217) [PR](https://github.com/yahoo/arrow/pull/218)
+
+# 0.5.0
+
+ * Adding feature to Import tests from other descriptors based test or group [ Details - https://github.com/yahoo/arrow/pull/200 ]
+ * Adding support for webdriver key object and improved error messaging [ Details - https://github.com/yahoo/arrow/pull/201 ]
+
 # 0.4.3
 
  * adding path method to return installed arrow directory [ Details - https://github.com/yahoo/arrow/pull/199 ]

README.md

@@ -1,3 +1,6 @@
+
+***NOTE: This project is under maintenance mode and is not actively worked upon. We will only work on severe issues/bugs,if and when needed. Please feel free to fork it if you want to add a feature or make any enhancement.
+
 #Arrow
 
 [![Build Status](https://secure.travis-ci.org/yahoo/arrow.png?branch=master)](http://travis-ci.org/yahoo/arrow)[![NPM version](https://badge.fury.io/js/yahoo-arrow.png)](http://badge.fury.io/js/yahoo-arrow)
@@ -38,10 +41,12 @@ npm install -g yahoo-arrow
 * **--seleniumHost** : (optional) override selenium host url (example: --seleniumHost=http://host.com:port/wd/hub)
 * **--capabilities** : (optional) the name of a json file containing webdriver capabilities required by your project
 * **--startProxyServer** : (optional) true/false. Starts a proxy server, intercepting all selenium browser calls
-* **--routerProxyConfig** : (optional) filePath. Expects a Json file, allows users to modify host and headers for all calls being made by browser. Also supports recording of select url calls ( if you mark "record" : true)
+* **--routerProxyConfig** : (optional) filePath. Expects a Json file, allows users to modify host and headers for all calls being made by browser. Also supports recording of select url calls ( if you mark "record" : true), and also supports recording the body of POST request (if you mark "storeBody": true), the default limit size of post body is 10240 bytes, you can change it by assigning "sizeLimit" : {integer in byte}.
 
          Example Json :
                        {
+                           "storeBody" : true,
+                           "sizeLimit": 4096,
                            "router":{
                                 "yahoo.com": {
                                      "newHost": "x.x.x.x (your new host ip/name)",

arrow_server/server.js

@@ -16,6 +16,8 @@ var path = require("path");
 var nopt = require("nopt");
 var http = require("http");
 var express = require("express");
+var bodyParser = require("body-parser");
+var cookieParser = require("cookie-parser");
 var log4js = require("log4js");
 var portchecker = require('../ext-lib/portchecker');
 
@@ -77,8 +79,8 @@ if (parsed["debug"]) {
 
 var app = express();
 app.use(log4js.connectLogger(logger));
-app.use(express.cookieParser());
-app.use(express.bodyParser());
+app.use(cookieParser());
+app.use(bodyParser.json());
 
 var mimes = {
     "css":"text/css",
@@ -360,7 +362,7 @@ app.get("/wd/hub/session/:sessionId", function (req, res) {
 });
 
 // Delete the session
-app.del("/wd/hub/session/:sessionId", function (req, res) {
+app.delete("/wd/hub/session/:sessionId", function (req, res) {
     res.contentType("application/json");
     res.send({status:9, value:"Delete session: Not Implemented"}, 501);
 });

config/config.js

@@ -9,6 +9,9 @@ var config = {};
 // User default config
 config.seleniumHost = "";
 config.phantomHost = "http://localhost:4445/wd/hub";
+config.sauceLabsHost = "http://ondemand.saucelabs.com:80/wd/hub";
+config.sauceUsername = "";
+config.sauceAccesskey = "";
 config.context = "";
 config.defaultAppHost = "";
 config.logLevel = "INFO";
@@ -20,7 +23,7 @@ config.baseUrl = "";
 config.arrowModuleRoot = global.appRoot + "/";
 config.dimensions = config.arrowModuleRoot + "config/dimensions.json";
 config.defaultTestHost = config.arrowModuleRoot + "lib/client/testHost.html";
-config.defaultAppSeed = "http://yui.yahooapis.com/3.8.0/build/yui/yui-min.js";
+config.defaultAppSeed = "//cdnjs.cloudflare.com/ajax/libs/yui/3.15.0/yui-min.js";
 config.autolib = config.arrowModuleRoot + "lib/common";
 
 //for yui sandbox

config/descriptor-schema.json

@@ -8,10 +8,13 @@
         "extends" : { "type" : "string"},
         "startProxyServer" : { "type" : "boolean"},
         "routerProxyConfig" : { "type" : "string"},
+        "comment" : { "type" : "string"},
         "config" : {
             "type" : "object"
         },
 
+        "dataDriver":{"type": "string"},
+
         "importDescriptor":{
             "type":"array",
             "items":[
@@ -36,7 +39,9 @@
                 "required":true,
                 "additionalProperties" : {
                     "type" : "object",
+
                     "properties" : {
+                        "comment" : { "type" : "string"},
                         "enabled" : { "type" : "boolean | string" },
                         "controller" : { "type" : "string" },
                         "group" : { "type" : "string" },

demo/mocha/importTests/finance-descriptor.json

@@ -28,10 +28,35 @@
                             "test": "../test/test-quote-mocha.js",
                             "quote": "Yahoo! Inc. (YHOO)"
 
+                        }
+                    ]
+                }
+            },
+
+            "Test AAPL Ticker" : {
+                "group" : "smoke",
+                "params" :{
+
+                    "scenario": [
+                        {
+                            "page": "$$config.baseUrl$$"
+                        },
+                        {
+                            "controller": "locator",
+                            "params": {
+                                "value": "#txtQuotes",
+                                "text": "aapl\n"
+                            }
+                        },
+                        {
+                            "test": "../test/test-quote-mocha.js",
+                            "quote": "Apple Inc. (AAPL)"
+
                         }
                     ]
                 }
             }
+
         }
     },
     {

demo/mocha/test/finance-controller-mocha.js

@@ -54,7 +54,7 @@ FinanceCustomController.prototype.execute = function(callback) {
 
         webdriver.waitForElementPresent(webdriver.By.css(".title")).then(function() {
             self.driver.executeTest(self.testConfig, self.testParams, function(error, report) {
-                callback();
+                callback(error);
             });
 
         });

demo/mocha/test/import-descriptor-all.json

@@ -0,0 +1,35 @@
+[
+    {
+        "settings": [ "master" ],
+
+        "name" : "import_test",
+
+        "config": {
+            "baseUrl": "http://finance.yahoo.com"
+        },
+
+        "importDescriptor":[
+            {
+                "path" : "../importTests/finance-descriptor.json"
+            }
+
+        ],
+
+        "dataprovider" : {
+
+            "dummy_test" : {
+                "params" : {
+                    "engine" : "mocha",
+                    "engineConfig" : "./mocha-config.json",
+                    "test" : "test-dummy-mocha.js",
+                    "page" : "http://finance.yahoo.com"
+                },
+                "group" : "int"
+
+            }
+
+        }
+
+
+    }
+]

demo/mocha/test/import-descriptor-group.json

@@ -11,7 +11,7 @@
         "importDescriptor":[
             {
                 "path" : "../importTests/finance-descriptor.json",
-                "group":"func"
+                "group":["func"]
             }
 
         ]

demo/mocha/test/import-descriptor-test.json

@@ -11,9 +11,26 @@
         "importDescriptor":[
             {
                 "path" : "../importTests/finance-descriptor.json",
-                "importTest":["Test YHOO Ticker"]
+                "test":["Test YHOO Ticker"]
             }
 
-        ]
+        ],
+
+        "dataprovider" : {
+
+            "dummy_test" : {
+                "params" : {
+                    "engine" : "mocha",
+                    "engineConfig" : "./mocha-config.json",
+                    "test" : "test-dummy-mocha.js",
+                    "page" : "http://finance.yahoo.com"
+                },
+                "group" : "int"
+
+            }
+
+        }
+
+
     }
 ]

demo/mocha/test/proxy-controller-record-mocha.js

@@ -34,7 +34,7 @@ ProxyCustomController.prototype.execute = function (callback) {
             console.log(record);
             self.testParams.proxyManagerRecord = record;
             self.driver.executeTest(self.testConfig, self.testParams, function (error, report) {
-                callback();
+                callback(error);
             });
 
         });

demo/mocha/test/test-dummy-mocha.js

@@ -0,0 +1,32 @@
+var
+    Y,
+    chai;
+
+describe('test-dummy-mocha', function(){
+    describe('test', function(){
+
+        before(function (done) {
+
+            // Initialize chai and YUI
+            if(typeof window  == "undefined" && typeof chai  == "undefined"){
+                chai = require('chai');
+            }
+            else{
+                chai = window.chai;
+            }
+
+            Y = YUI().use('node', function ()
+            {
+                done();
+            });
+
+        });
+
+        it('has dummy one', function(done){
+
+            chai.assert(1==1);
+            done();
+
+        });
+    });
+});

demo/test/capabilities.json

@@ -0,0 +1,11 @@
+{
+    "capabilities": {
+        "mac_chrome": {
+            "browserName": "chrome",
+            "platform": "MAC"
+        }
+    },
+    "common_capabilities": {
+        "javascriptEnabled": "true"
+    }
+}

demo/test/datadriven/configdata.json

@@ -0,0 +1,16 @@
+{
+    "config": [
+        {
+            "finance": {
+                "baseUrl": "http://finance.yahoo.com",
+                "searchBtnId": "#mnp-search_box"
+            }
+        },
+        {
+            "yahoo": {
+                "baseUrl": "http://yahoo.com",
+                "searchBtnId": "#p_13838465-p"
+            }
+        }
+    ]
+}