Merge pull request #1 from browserstack/restructure

restructure

Author: tr4n2uil

.gitignore

@@ -0,0 +1,2 @@
+node_modules
+local.log

README.md

@@ -3,16 +3,20 @@ wd-browserstack
 
 Sample for using [wd](https://github.com/admc/wd) with BrowserStack Automate.
 
-###Install dependencies for testing
+### Install dependencies for testing
+
 - `npm install`
 
-###Configuring the json
+### Configuring the json
+
  - Open the test js files (`browserstack_async.js` or `browserstack_promises.js`)
  - Replace `BROWSERSTACK_USERNAME` and `BROWSERSTACK_ACCESS_KEY` with your BrowserStack credentials. Don't have one? Get one on BrowserStack [dashboard]
  - Add / customise more [capabilities] to `desired` object in the js files
 
-###Sample test
- - To start a test run: `node browserstack_async.js` or `node browserstack_promises.js`
+### Run the tests
+
+ - To start a single test run: `npm test` or `npm run test_single` or `npm run test_async` or `npm run test_promises`
+ - To start local tests run: `npm run test_local`
 
 [capabilities]:http://www.browserstack.com/automate/capabilities
 [dashboard]:https://www.browserstack.com/automate

browserstack_async.js

@@ -36,7 +36,6 @@ browser.init(desired, function() {
       title.should.include('WD');
       browser.elementById('i am a link', function(err, el) {
         browser.clickElement(el, function() {
-          /* jshint evil: true */
           browser.eval("window.location.href", function(err, href) {
             href.should.include('guinea-pig2');
             browser.quit();

browserstack_local_async.js

@@ -0,0 +1,48 @@
+var username = process.env.BROWSERSTACK_USERNAME || "BROWSERSTACK_USERNAME";
+var accessKey = process.env.BROWSERSTACK_ACCESS_KEY || "BROWSERSTACK_ACCESS_KEY";
+
+require('colors');
+var chai = require('chai');
+var wd = require('wd');
+
+chai.should();
+
+var browser = wd.remote("hub.browserstack.com", 80, username, accessKey);
+
+// optional extra logging
+browser.on('status', function(info) {
+  console.log(info.cyan);
+});
+browser.on('command', function(eventType, command, response) {
+  console.log(' > ' + eventType.cyan, command, (response || '').grey);
+});
+browser.on('http', function(meth, path, data) {
+  console.log(' > ' + meth.magenta, path, (data || '').grey);
+});
+
+var desired = {
+  os: 'OS X',
+  os_version: 'El Capitan',
+  browser: 'chrome',
+  browser_version: '',
+  project: "examples",
+  name: "This is an example local test",
+  build: "WD BrowserStack Sample Test",
+  "browserstack.local": true
+};
+
+browser.init(desired, function() {
+  browser.get("http://admc.io/wd/test-pages/guinea-pig.html", function() {
+    browser.title(function(err, title) {
+      title.should.include('WD');
+      browser.elementById('i am a link', function(err, el) {
+        browser.clickElement(el, function() {
+          browser.eval("window.location.href", function(err, href) {
+            href.should.include('guinea-pig2');
+            browser.quit();
+          });
+        });
+      });
+    });
+  });
+});

browserstack_promises.js

@@ -35,7 +35,6 @@ var desired = {
   build: "WD BrowserStack Sample Test"
 };
 
-/* jshint evil: true */
 browser
   .init(desired)
   .get("http://admc.io/wd/test-pages/guinea-pig.html")

package.json

@@ -18,7 +18,15 @@
     "url": "https://github.com/browserstack/wd-browserstack/issues"
   },
   "homepage": "https://github.com/browserstack/wd-browserstack#readme",
+  "scripts": {
+    "test": "node browserstack_async.js",
+    "test_local": "node scripts/test_local.js",
+    "test_async": "node browserstack_async.js",
+    "test_single": "node browserstack_promises.js",
+    "test_promises": "node browserstack_promises.js"
+  },
   "dependencies": {
+    "browserstack-local": "^0.1.0",
     "chai": "^3.5.0",
     "chai-as-promised": "^5.2.0",
     "colors": "^1.1.2",

scripts/test_local.js

@@ -0,0 +1,28 @@
+var child_process = require('child_process');
+var browserstack = require('browserstack-local');
+
+var bs_local = new browserstack.Local();
+var bs_local_args = { 'key': process.env.BROWSERSTACK_ACCESS_KEY, 'forcelocal': true };
+
+bs_local.start(bs_local_args, function(error) {
+  if (error) {
+    console.log(error);
+  } else {
+    console.log('Connected. Now testing...');
+
+    child = child_process.execSync('node browserstack_local_async.js', { stdio: [ 0, 0, 0 ] });
+
+    if(child) {
+      child.on('exit', function() {
+        if(bs_local) {
+          bs_local.stop(function() {});
+        }
+
+        exit(0);
+      });
+    }
+  }
+  if(bs_local) {
+    bs_local.stop(function() {});
+  }
+});