Skip to content

Commit

Permalink
Merge commit 'df9a6b01de4f6059aee697af375f8c5b22570dfb' into feature/…
Browse files Browse the repository at this point in the history
…lifetime

Conflicts:
	CHANGES_NEXT_RELEASE
  • Loading branch information
janantala committed May 11, 2015
2 parents 10fd25e + df9a6b0 commit f7126bd
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 3 deletions.
18 changes: 18 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: node_js

node_js:
- "0.10"

branches:
only:
- develop
- master

services:
- mongodb

install:
- npm install

before_install:
- npm install -g grunt-cli
3 changes: 2 additions & 1 deletion CHANGES_NEXT_RELEASE
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
- Fix command line break when executing command before starting the server (#47).
- FIX Client handler after connection update (#51)
- FIX Remove old device registration on the new registration (#52)
- Add Check lifetime and unregister devices (#56)
- Add Travis CI files and changes to enable it in the package.json (#55).
- Add Check lifetime and unregister devices (#56)
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"node": ">=0.10.8"
},
"scripts": {
"test": "grunt test"
"test": "grunt"
},
"dependencies": {
"command-node": "0.1.1",
Expand Down
2 changes: 1 addition & 1 deletion test/unit/server/information-reporting-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ describe('Information reporting interface', function() {
});
});
});
describe('When the user invokes the Cancel operation on a resource', function() {
describe.skip('When the user invokes the Cancel operation on a resource', function() {
beforeEach(function () {
server.on('request', function (req, res) {
function notify(msg) {
Expand Down

0 comments on commit f7126bd

Please sign in to comment.