Skip to content

Commit cdba663

Browse files
committed
lots of cleanup
1 parent d4a28ba commit cdba663

File tree

9 files changed

+14
-45
lines changed

9 files changed

+14
-45
lines changed

.babelrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# editorconfig.org
22
root = true
33

4-
[*.js]
4+
[*.ts]
55
indent_style = space
66
indent_size = 2
77
end_of_line = lf

package.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,13 @@
3636
"deepmerge": "^3.0.0"
3737
},
3838
"devDependencies": {
39-
"babel-cli": "6.26.0",
40-
"babel-core": "6.26.3",
41-
"babel-eslint": "7.2.3",
42-
"babel-plugin-transform-object-rest-spread": "6.26.0",
43-
"babel-preset-env": "1.7.0",
44-
"babel-register": "6.26.0",
4539
"bluebird": "3.5.4",
4640
"chai": "3.5.0",
4741
"eslint": "3.19.0",
4842
"eslint-plugin-babel": "3.3.0",
4943
"express": "4.16.4",
5044
"graphql-server-express": "0.6.0",
45+
"jest": "^25.1.0",
5146
"mocha": "3.5.3",
5247
"rimraf": "2.6.3",
5348
"sinon": "1.17.7",

src/helper.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import { createResolver, ResultFunction, ErrorFunction, Resolver } from "./resolver";
21
import * as merge from "deepmerge";
3-
import { isFunction } from "./util";
42

53
// Helper function to combine multiple resolver definition hashes into a single hash for consumption by Apollostack's graphql-server
64
export const combineResolvers = (resolvers = []) => resolvers

src/resolver.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { getPromise } from './promise';
22
import { isFunction, Promisify, isNotNullOrUndefined } from './util';
33

4-
const Promise = getPromise();
5-
64
export interface ResultFunction<ResulType> {
75
(root, args, context, info): Promise<ResulType> | ResulType | void
86
}

test/integration/promise_spec.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

test/unit/helper_spec.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ import { expect } from 'chai';
22
import { stub } from 'sinon';
33

44
import {
5-
combineResolvers, and, or, compose, composable
5+
combineResolvers, and, or
66
} from '../../dist/helper';
77
import { createResolver } from '../../dist/resolver';
8-
import { resolveAll } from 'jspm-config';
98

109
describe('(unit) src/helper.js', () => {
1110
describe('combineResolvers', () => {

test/unit/promise_spec.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { expect } from 'chai';
2+
import Bluebird from 'bluebird';
23

34
import {
45
usePromise
@@ -7,6 +8,16 @@ import {
78
describe('(unit) dist/promise.js', () => {
89
after(() => usePromise(Promise));
910
describe('usePromise', () => {
11+
context('with Bluebird', () => {
12+
it('does not throw', () => {
13+
usePromise(Bluebird);
14+
});
15+
});
16+
context('with ES6 Promise', () => {
17+
it('does not throw', () => {
18+
usePromise(Promise);
19+
});
20+
});
1021
context('with another valid promise lib', () => {
1122
it('does not throw', () => {
1223
class FakePromiseLib {

test/unit/resolver_spec.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
import { expect } from 'chai';
22
import { stub } from 'sinon';
3-
import Bluebird from 'bluebird';
43

54
import { createResolver } from '../../dist/resolver';
6-
import { usePromise } from '../../dist/promise';
7-
8-
let originalPromise = Promise;
95

106
describe('(unit) dist/resolver.js', () => {
117
describe('createResolver', () => {

0 commit comments

Comments
 (0)