diff --git a/.travis.yml b/.travis.yml index ee6bef2..e03dd20 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,4 @@ sudo: false node_js: - 0.12 script: - - npm run karma \ No newline at end of file + - npm run test \ No newline at end of file diff --git a/package.json b/package.json index 4beba5f..df7bfbe 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,7 @@ "test": "test" }, "scripts": { - "test": "mocha", - "karma": "./node_modules/.bin/karma start --single-run --no-auto-watch --browsers PhantomJS; exit 0" + "test": "./node_modules/.bin/karma start --single-run --no-auto-watch --browsers PhantomJS" }, "repository": { "type": "git", diff --git a/test/specs/basics.spec.js b/test/specs/basics.spec.js index 69a5e7a..2d939f9 100644 --- a/test/specs/basics.spec.js +++ b/test/specs/basics.spec.js @@ -1,8 +1,3 @@ -var expect = chai.expect; -var should = chai.should(); - -// load basics.js into new VM - describe( 'Main', function() { var sandbox; @@ -37,20 +32,11 @@ describe( 'Main', function() { }); }); - describe('canDrive', function() { - it ('should be true if `person` is atleast 16 years old', function() { - expect(canDrive).to.exist; - (typeof canDrive).should.equal('boolean'); - canDrive.should.equal(person.age >= 16); - }); - }); - describe( '#greet', function() { it('should be a function', function() { (typeof greet).should.equal('function'); }); - it( 'should print a greeting', function() { var name = 'Dev League'; greet( name ); @@ -61,6 +47,14 @@ describe( 'Main', function() { }); }); + describe('canDrive', function() { + it ('should be true if `person` is atleast 16 years old', function() { + expect(canDrive).to.exist; + (typeof canDrive).should.equal('function'); + canDrive().should.equal(person.age >= 16); + }); + }); + describe('dataTypes', function() { it('should be an array', function() { expect(dataTypes).to.exist; @@ -85,12 +79,6 @@ describe( 'Main', function() { }); describe( 'dog object literal', function() { - // var spot = new Dog('Spot'); - // it('should be a function', function() { - // (typeof Dog).should.equal('object'); - // expect(Dog).to.exist; - // }); - it('should be an object', function() { dog.should.be.an('object'); expect(dog).to.exist;