Merge pull request #46 from mdix/master

docs(assertions): added documentation concerning chaining to.contain() to several assertions
add waffle.io badge
Allow passing a JS test object rather than a filename of tests

When using dalek from JS rather than from the command line, it is useful to be able to pass an object of tests rather than the filename of a file which contains tests.

Example (which works with provided patch) and is the only file required (no extra file containing tests needed):

var Dalek = require("dalekjs");

var tests1 = [{
    'Page title is correct': function (test) {
      test
        .open('http://google.com')
        .assert.title().is('Google', 'It has title')
        .done();
    }
}];

var dalek = new Dalek({
    tests: tests1, browser: ["chrome"],
    driver: [], reporter: [], viewport: {}, logLevel: 5, 
    noColors: true, noSymbols: false, remote: null
});

dalek.run();
var Dalek = require("dalekjs");

var tests1 = [{
    'Page title is correct': function (test) {
      test
        .open('http://google.com')
        .assert.title().is('Google', 'It has title')
        .done();
    }
},{
    'Page title is correct, 2': function (test) {
      test
        .open('http://dalekjs.com')
        .assert.title().is(
            'DalekJS - Automated cross browser testing with JavaScript',
            'It has title')
        .done();
    }
}];

var dalek = new Dalek({
    tests: tests1, browser: ["chrome"],
    driver: [], reporter: [], viewport: {}, logLevel: 5,
    noColors: true, noSymbols: false, remote: null
});

dalek.run();
Merge pull request #48 from waffleio/master

waffle.io Badge
Merge pull request #51 from stuartlangridge/patch-1

feat(core): allow passing a JS test object rather than a filename of tests
Update README.md
open method will now append configured baseUrl from Dalekfile.js if needed (#60)
ability to use glob matching in Dalekfile.js tests (#62)
Merge pull request #61 from ryanzec/base-url-config

feat(core): open method will now append configured baseUrl from Dalekfile.js if needed (#60)
Merge pull request #63 from ryanzec/glob-tests-config

feat(config): ability to use glob matching in Dalekfile.js tests (#62)
chore(dependencies): Upped dependencies
Merge branch 'master' of github.com:dalekjs/dalek

* 'master' of github.com:dalekjs/dalek:
  ability to use glob matching in Dalekfile.js tests (#62)
  open method will now append configured baseUrl from Dalekfile.js if needed (#60)
  Update README.md
  Allow passing a JS test object rather than a filename of tests
  add waffle.io badge
  Added documentation concerning chaining to.contain() to several assertions
  Small documentation improvements. - Typos, grammar - Language - Links - Code syntax - Code formatting
  Let user know why loading a suite failed
  Added comment on %, em, ... values
  Fixed doc block
  Replaced parseInt with parseFloat (you might use like 0.3em)
  Improved declaration of comparisonOperator
  Added greater than and lower than assertion methods to css() assertion
  Added *storm project configuration directory to gitignore
  chore(suite): reorder and summarize variable decleration
  feat(suite): bind this to the current test

feat(maintain): Upstream PR
chore(lint): fix indent
fix(build): fix build process
chore(dependencies): updating dependencies
chore(dependencies): updated dependencies
chore(gruntfile): updated Gruntfile
chore(travis): Removed node 0.8
chore(README): added badges