Skip to content

Commit

Permalink
fix: Update various libraries to their latest versions
Browse files Browse the repository at this point in the history
  • Loading branch information
notheotherben committed Feb 22, 2016
1 parent d426f7f commit 8d3e311
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 67 deletions.
7 changes: 4 additions & 3 deletions dist/lib/utils/Omnom.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/lib/utils/Omnom.js.map

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions lib/utils/Omnom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export class Omnom {
if (!_.isPlainObject(original) || !_.isPlainObject(modified))
return !_.isEqual(original, modified) && this.set(changePath, modified);

_.each(modified, function (value, key) {
_.each(modified, (value, key) => {
// Handle array diffs in their own special way
if (Array.isArray(value) && Array.isArray(original[key])) this.onArray(original[key], value, this.resolve(changePath, key));

Expand All @@ -85,12 +85,12 @@ export class Omnom {
}, this);

// Unset removed properties
_.each(original, function (value, key) {
_.each(original, (value, key) => {
if (modified[key] === undefined) return this.unset(this.resolve(changePath, key));
}, this);
}

private onArray(original: [any], modified: [any], changePath: string) {
private onArray(original: any[], modified: any[], changePath: string) {
var i, j;

// Check if we can get from original => modified using just pulls
Expand Down
51 changes: 25 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,40 +29,39 @@
"node": ">= 0.10"
},
"dependencies": {
"bluebird": "^2.10.1",
"lodash": "^3.10.1",
"mongodb": "^2.0.44",
"skmatc": "^1.1.4"
"bluebird": "^3.3.1",
"lodash": "^4.5.1",
"mongodb": "~2.1.7",
"skmatc": "^1.2.0"
},
"devDependencies": {
"chai": "^2.2.0",
"chai-as-promised": "^5.1.0",
"chai-fuzzy": "^1.6.0",
"codeclimate-test-reporter": "~0.0.4",
"coveralls": "^2.11.4",
"del": "^1.2.1",
"gulp": "^3.9.0",
"gulp-bump": "~0.3.1",
"gulp-git": "^1.4.0",
"gulp-istanbul": "^0.10.1",
"gulp-mocha": "^2.1.3",
"gulp-plumber": "^1.0.1",
"gulp-replace": "^0.5.4",
"gulp-sourcemaps": "^1.6.0",
"chai": "^3.5.0",
"chai-as-promised": "^5.2.0",
"codeclimate-test-reporter": "^0.3.1",
"coveralls": "^2.11.6",
"del": "^2.2.0",
"gulp": "^3.9.1",
"gulp-bump": "^1.0.0",
"gulp-git": "~1.7.0",
"gulp-istanbul": "~0.10.3",
"gulp-mocha": "~2.2.0",
"gulp-plumber": "~1.1.0",
"gulp-replace": "~0.5.4",
"gulp-sourcemaps": "~1.6.0",
"gulp-typedoc": "^1.2.1",
"gulp-typescript": "^2.9.0",
"gulp-util": "^3.0.6",
"istanbul": "^0.3.21",
"gulp-typescript": "^2.11.0",
"gulp-util": "~3.0.7",
"istanbul": "~0.4.2",
"jshint": "^2.8.0",
"minimist": "^1.2.0",
"mocha": "^2.3.3",
"mocha": "^2.4.5",
"require-dir": "~0.3.0",
"run-sequence": "^1.1.4",
"semver": "^4.3.6",
"semver": "^5.1.0",
"tick": "~0.1.1",
"typedoc": "^0.3.11",
"typescript": "^1.6.2",
"underscore": "^1.8.3"
"typedoc": "~0.3.12",
"typescript": "~1.7.5",
"underscore": "~1.8.3"
},
"keywords": [
"mongodb",
Expand Down
4 changes: 2 additions & 2 deletions test/Decorators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ describe("Decorators", () => {
});

it("should support just spec indexes", () => {
chai.expect(Test.indexes).to.containOneLike({ spec: { name: 1 }, options: {} });
chai.expect(Test.indexes).to.contain({ spec: { name: 1 }, options: {} });
});

it("should support indexes with both a spec and options", () => {
chai.expect(Test.indexes).to.containOneLike({ spec: { email: 1 }, options: { background: true }});
chai.expect(Test.indexes).to.contain({ spec: { email: 1 }, options: { background: true }});
});

it("should not pollute the parent's index object", () => {
Expand Down
2 changes: 0 additions & 2 deletions test/support/chai.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
import chai = require('chai');
import chaiAsPromised = require('chai-as-promised');
import Bluebird = require('bluebird');
var chaiFuzzy = require('chai-fuzzy');

Bluebird.longStackTraces();

chai.use(chaiAsPromised);
chai.use(chaiFuzzy);

global.chai = chai;
global.expect = chai.expect;
3 changes: 0 additions & 3 deletions tsd.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
"mocha/mocha.d.ts": {
"commit": "cb08e83dd87ace1202d1032a8f275b3efacde5c3"
},
"chai-fuzzy/chai-fuzzy.d.ts": {
"commit": "cb08e83dd87ace1202d1032a8f275b3efacde5c3"
},
"chai/chai.d.ts": {
"commit": "cb08e83dd87ace1202d1032a8f275b3efacde5c3"
},
Expand Down
26 changes: 0 additions & 26 deletions typings/DefinitelyTyped/chai-fuzzy/chai-fuzzy.d.ts

This file was deleted.

1 change: 0 additions & 1 deletion typings/DefinitelyTyped/tsd.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
/// <reference path="lodash/lodash.d.ts" />
/// <reference path="node/node.d.ts" />
/// <reference path="chai-as-promised/chai-as-promised.d.ts" />
/// <reference path="chai-fuzzy/chai-fuzzy.d.ts" />
/// <reference path="chai/chai.d.ts" />
/// <reference path="mocha/mocha.d.ts" />

0 comments on commit 8d3e311

Please sign in to comment.