Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feathers-service-tests@0.6.2 breaks build 🚨 #100

Merged
merged 3 commits into from
Jul 9, 2016
Merged

feathers-service-tests@0.6.2 breaks build 🚨 #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bbc6bb
chore(package): update feathers-service-tests to version 0.6.2
greenkeeperio-bot Jul 8, 2016
f96f773
Make sure original data are not being modified
daffl Jul 9, 2016
4ff66c5
Load Feathers with babel-polyfill in all tests
daffl Jul 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
"lib": "lib"
},
"dependencies": {
"babel-polyfill": "^6.3.14",
"feathers-errors": "^2.0.1",
"feathers-query-filters": "^1.5.1",
"lodash.omit": "^4.3.0",
"uberproto": "^1.2.0"
},
"devDependencies": {
Expand All @@ -65,10 +65,10 @@
"babel-preset-es2015": "^6.1.2",
"body-parser": "^1.14.1",
"chai": "^3.4.1",
"feathers": "^2.0.0-pre.4",
"feathers": "^2.0.0",
"feathers-hooks": "^1.1.0",
"feathers-rest": "^1.2.2",
"feathers-service-tests": "^0.6.0",
"feathers-service-tests": "^0.6.2",
"feathers-socketio": "^1.3.3",
"jshint": "^2.8.0",
"mocha": "^2.5.0",
Expand Down
2 changes: 0 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
if(!global._babelPolyfill) { require('babel-polyfill'); }

import * as hooks from './hooks';
import service from './service';

Expand Down
5 changes: 3 additions & 2 deletions src/service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import omit from 'lodash.omit';
import Proto from 'uberproto';
import filter from 'feathers-query-filters';
import errors from 'feathers-errors';
Expand Down Expand Up @@ -147,11 +148,11 @@ class Service {

if (this.id === '_id') {
// We can not update default mongo ids
delete data[this.id];
data = omit(data, this.id);
} else {
// If not using the default Mongo _id field set the id to its
// previous value. This prevents orphaned documents.
data[this.id] = id;
data = Object.assign({}, data, { [this.id]: id });
}

return this.Model
Expand Down
1 change: 1 addition & 0 deletions test/error-handler.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'feathers';
import { expect } from 'chai';
import mongoose from 'mongoose';
import errors from 'feathers-errors';
Expand Down
1 change: 1 addition & 0 deletions test/hooks.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'feathers';
import chai from 'chai';
import sinon from 'sinon';
import sinonChai from 'sinon-chai';
Expand Down