Permalink
Browse files

Merge pull request #8 from ga-wdi-boston/015/master

Updates from node-template
  • Loading branch information...
raq929 authored and GitHub committed Dec 7, 2016
2 parents 73b807d + 79f9a7d commit 59c8f2fd8824f50bd26cdaa72c28700bfce1ea0c
Showing with 16 additions and 9 deletions.
  1. +1 −1 README.md
  2. 0 { → data}/example.json
  3. +7 −0 data/names.txt
  4. +0 −3 example.txt
  5. +7 −4 package.json
  6. +1 −1 spec/example.spec.js
@@ -126,7 +126,7 @@ const readJSON = function (filename) {
.then(JSON.parse); // what can we surmise about .then?
readJSON('./example.jsom')
readJSON('./example.json')
.then(callback) // do something with the object
.catch(console.error); // handle error conditions
```
File renamed without changes.
@@ -0,0 +1,7 @@
Alex
Pete
REL
Matt
Patty
Jooleeuh
Kostanza

This file was deleted.

Oops, something went wrong.
@@ -2,20 +2,23 @@
"name": "ga-wdi-boston.node-api-promises",
"version": "0.0.1",
"private": true,
"license": "MIT",
"license": {
"software": "GNU GPLv3",
"content": "CC­BY­NC­SA 4.0"
},
"dependencies": {},
"devDependencies": {
"chai": "^3.5.0",
"chai-as-promised": "^5.3.0",
"chai-as-promised": "^6.0.0",
"grunt": "^1.0.1",
"grunt-concurrent": "^2.3.1",
"grunt-contrib-jshint": "^1.0.0",
"grunt-jscs": "^3.0.1",
"grunt-jsonlint": "^1.1.0",
"grunt-mocha-test": "^0.12.7",
"grunt-mocha-test": "^0.13.2",
"grunt-nodemon": "^0.4.2",
"load-grunt-config": "^0.19.2",
"mocha": "^3.0.2",
"mocha": "^3.1.2",
"time-grunt": "^1.4.0"
}
}
@@ -32,6 +32,6 @@ describe('Async', function () {

describe('Promise', function () {
it('is true', function () {
expect(example.promise(true)).to.eventually.be.true;
return expect(example.promise(true)).to.eventually.be.true;
});
});

0 comments on commit 59c8f2f

Please sign in to comment.