将 fixture 和 mock 放置到 teambition-sdk-testutil 包内

...简化项目结构。
teambition · Aug 23, 2017 · 757001a · 757001a
1 parent d833be5
commit 757001a
Show file tree

Hide file tree

Showing 40 changed files with 60 additions and 97 deletions.
diff --git a/.nycrc.json b/.nycrc.json
@@ -1,7 +1,6 @@
 {
   "exclude": [
-    "**/teambition-sdk-mock/**",
-    "**/teambition-sdk-fixture/**"
+    "**/teambition-sdk-testutil/**"
   ],
   "include": [
     "**/src/**"

diff --git a/circle.yml b/circle.yml
@@ -12,6 +12,8 @@ dependencies:
     - ~/.cache/yarn
 
 test:
+  override:
+    - yarn test
   pre:
     - greenkeeper-lockfile-update
     - lerna run build_cjs

diff --git a/package.json b/package.json
@@ -64,9 +64,8 @@
     "snapper-consumer": "^1.3.6",
     "source-map-support": "^0.4.16",
     "teambition-sdk-core": "^0.8.13",
-    "teambition-sdk-fixture": "^0.8.13",
-    "teambition-sdk-mock": "^0.8.13",
     "teambition-sdk-request": "^0.8.13",
+    "teambition-sdk-testutil": "^0.8.13",
     "tman": "^1.7.1",
     "ts-node": "^3.2.0",
     "tslib": "^1.7.1",

diff --git a/packages/teambition-sdk-core/package.json b/packages/teambition-sdk-core/package.json
@@ -73,8 +73,7 @@
     "sinon": "^2.3.8",
     "sinon-chai": "^2.11.0",
     "snapper-consumer": "^1.3.6",
-    "teambition-sdk-fixture": "^0.8.13",
-    "teambition-sdk-mock": "^0.8.13",
+    "teambition-sdk-testutil": "^0.8.13",
     "tman": "^1.7.1",
     "ts-node": "^3.2.0",
     "tslib": "^1.7.1",

diff --git a/packages/teambition-sdk-core/test/mock/MockFetch.ts b/packages/teambition-sdk-core/test/mock/MockFetch.ts
@@ -1,4 +1,4 @@
-import { Backend } from 'teambition-sdk-mock'
+import { Backend } from 'teambition-sdk-testutil'
 import { SDKFetch } from '../index'
 
 function throwIfSlashPath(path: string) {

diff --git a/packages/teambition-sdk-core/test/mock/MockSpec.ts b/packages/teambition-sdk-core/test/mock/MockSpec.ts
@@ -2,7 +2,7 @@
 import * as chai from 'chai'
 import * as sinon from 'sinon'
 import * as sinonChai from 'sinon-chai'
-import { Backend, parseObject, reParseQuery } from 'teambition-sdk-mock'
+import { Backend, parseObject, reParseQuery } from 'teambition-sdk-testutil'
 import { describe, it, beforeEach } from 'tman'
 
 const expect = chai.expect

diff --git a/packages/teambition-sdk-core/test/net/net.ts b/packages/teambition-sdk-core/test/net/net.ts
@@ -4,12 +4,11 @@ import { Database, DataStoreType } from 'reactivedb'
 import { expect, use } from 'chai'
 import { spy } from 'sinon'
 import * as SinonChai from 'sinon-chai'
-import { Backend } from 'teambition-sdk-mock'
+import { Backend, EventsFixture } from 'teambition-sdk-testutil'
 import '../../src/schemas'
 import { schemas, CacheStrategy } from '../../src/SDK'
 import { Net, SDKFetch, forEach, uuid, Http, EventSchema,  } from '..'
 import { ApiResult } from '../../src/Net/Net'
-import { EventsFixture } from 'teambition-sdk-fixture'
 
 const { normalEvent, projectEvents } = EventsFixture
 

diff --git a/packages/teambition-sdk-core/test/sockets/eventParser.spec.ts b/packages/teambition-sdk-core/test/sockets/eventParser.spec.ts
@@ -1,4 +1,4 @@
-import { RequestEvent } from 'teambition-sdk-mock'
+import { RequestEvent } from 'teambition-sdk-testutil'
 import { describe, beforeEach, it } from 'tman'
 import { expect } from 'chai'
 

diff --git a/packages/teambition-sdk-core/test/sockets/sockets.spec.ts b/packages/teambition-sdk-core/test/sockets/sockets.spec.ts
@@ -1,6 +1,6 @@
 import { describe, beforeEach, afterEach, it } from 'tman'
 import { expect } from 'chai'
-import { SocketMock } from 'teambition-sdk-mock'
+import { SocketMock } from 'teambition-sdk-testutil'
 import { createSdk, SDK, SDKFetch } from '../'
 import { restore } from '../utils'
 import * as sinon from 'sinon'

diff --git a/packages/teambition-sdk-core/test/utils/httpErrorSpec.ts b/packages/teambition-sdk-core/test/utils/httpErrorSpec.ts
@@ -1,7 +1,7 @@
 import * as chai from 'chai'
 import { Subject } from 'rxjs/Subject'
 import { describe, it, beforeEach, afterEach } from 'tman'
-import { Backend } from 'teambition-sdk-mock'
+import { Backend } from 'teambition-sdk-testutil'
 
 import { Http, HttpErrorMessage, SDKFetch } from '../index'
 

diff --git a/packages/teambition-sdk-mock/package.json b/packages/teambition-sdk-mock/package.json
diff --git a/packages/teambition-sdk-mock/tsconfig.json b/packages/teambition-sdk-mock/tsconfig.json
diff --git a/packages/teambition-sdk-request/package.json b/packages/teambition-sdk-request/package.json
@@ -56,8 +56,7 @@
     "sinon": "^2.3.8",
     "sinon-chai": "^2.11.0",
     "teambition-sdk-core": "^0.8.13",
-    "teambition-sdk-fixture": "^0.8.13",
-    "teambition-sdk-mock": "^0.8.13",
+    "teambition-sdk-testutil": "^0.8.13",
     "tman": "^1.7.1",
     "ts-node": "^3.2.0",
     "tslib": "^1.7.1",

diff --git a/packages/teambition-sdk-request/test/apis/EventGenerator.spec.ts b/packages/teambition-sdk-request/test/apis/EventGenerator.spec.ts
@@ -1,7 +1,7 @@
 import { describe, beforeEach, it } from 'tman'
 import { expect } from 'chai'
 import * as Moment from 'moment'
-import { EventsFixture } from 'teambition-sdk-fixture'
+import { EventsFixture } from 'teambition-sdk-testutil'
 import { EventGenerator } from '../../src/event/EventGenerator'
 import { Utils } from 'teambition-sdk-core'
 

diff --git a/packages/teambition-sdk-request/test/apis/event.spec.ts b/packages/teambition-sdk-request/test/apis/event.spec.ts
@@ -2,8 +2,7 @@ import * as moment from 'moment'
 import { describe, beforeEach, afterEach, it } from 'tman'
 import { expect } from 'chai'
 import { SDK, EventSchema } from 'teambition-sdk-core'
-import { EventsFixture } from 'teambition-sdk-fixture'
-import { SocketMock } from 'teambition-sdk-mock'
+import { EventsFixture, SocketMock } from 'teambition-sdk-testutil'
 import { createSdk } from '../index'
 import { mock, restore, equals, looseDeepEqual, clone } from '../utils'
 

diff --git a/packages/teambition-sdk-request/test/apis/file.spec.ts b/packages/teambition-sdk-request/test/apis/file.spec.ts
@@ -1,9 +1,8 @@
 import { describe, beforeEach, afterEach, it } from 'tman'
 import { expect } from 'chai'
 import { SDK, FileSchema } from 'teambition-sdk-core'
-import { SocketMock } from 'teambition-sdk-mock'
+import { FilesFixture, SocketMock } from 'teambition-sdk-testutil'
 import { createSdk } from '../index'
-import { FilesFixture } from 'teambition-sdk-fixture'
 import { mock, restore, looseDeepEqual } from '../utils'
 
 describe('FileApi Spec', () => {

diff --git a/packages/teambition-sdk-request/test/apis/like.spec.ts b/packages/teambition-sdk-request/test/apis/like.spec.ts
@@ -2,9 +2,8 @@
 import { expect } from 'chai'
 import { describe, it, beforeEach, afterEach } from 'tman'
 import { SDK, LikeSchema } from 'teambition-sdk-core'
-import { SocketMock } from 'teambition-sdk-mock'
+import { LikeFixture as like, SocketMock } from 'teambition-sdk-testutil'
 import { createSdk } from '../index'
-import { LikeFixture as like } from 'teambition-sdk-fixture'
 import { mock, restore } from '../utils'
 
 describe('LikeApi Spec: ', () => {

diff --git a/packages/teambition-sdk-request/test/apis/my.spec.ts b/packages/teambition-sdk-request/test/apis/my.spec.ts
@@ -1,10 +1,9 @@
 import { describe, it, beforeEach, afterEach } from 'tman'
 import { expect } from 'chai'
 import { SDK, EventSchema, TaskSchema } from 'teambition-sdk-core'
-import { SocketMock } from 'teambition-sdk-mock'
+import { MyFixture, SocketMock } from 'teambition-sdk-testutil'
 import { createSdk } from '../index'
 import { EventGenerator, isRecurrence } from '../../src/event'
-import { MyFixture } from 'teambition-sdk-fixture'
 import { mock, restore } from '../utils'
 
 function normIfRecurrentEvent(myRecent: any[]): any[] {

diff --git a/packages/teambition-sdk-request/test/apis/post.spec.ts b/packages/teambition-sdk-request/test/apis/post.spec.ts
@@ -1,9 +1,8 @@
 import { describe, beforeEach, afterEach, it } from 'tman'
 import { expect } from 'chai'
 import { SDK, PostSchema } from 'teambition-sdk-core'
-import { SocketMock } from 'teambition-sdk-mock'
+import { PostsFixture, SocketMock } from 'teambition-sdk-testutil'
 import { createSdk } from '../index'
-import { PostsFixture } from 'teambition-sdk-fixture'
 import { mock, restore, equals } from '../utils'
 import { shuffle } from 'lodash'
 

diff --git a/packages/teambition-sdk-request/test/apis/task.spec.ts b/packages/teambition-sdk-request/test/apis/task.spec.ts
@@ -1,9 +1,8 @@
 import { describe, beforeEach, afterEach, it } from 'tman'
 import { expect } from 'chai'
 import { SDK, TaskSchema } from 'teambition-sdk-core'
-import { SocketMock } from 'teambition-sdk-mock'
+import { SocketMock, TasksFixture } from 'teambition-sdk-testutil'
 import { createSdk } from '../index'
-import { TasksFixture } from 'teambition-sdk-fixture'
 import { mock, restore, looseDeepEqual } from '../utils'
 
 describe('TaskApi Spec', () => {

diff --git a/packages/teambition-sdk-request/test/apis/user.spec.ts b/packages/teambition-sdk-request/test/apis/user.spec.ts
@@ -1,9 +1,8 @@
 import { describe, beforeEach, afterEach, it } from 'tman'
 import { expect } from 'chai'
 import { SDK, UserMe } from 'teambition-sdk-core'
-import { SocketMock } from 'teambition-sdk-mock'
+import { SocketMock, UserFixture as userMe } from 'teambition-sdk-testutil'
 import { createSdk } from '../index'
-import { UserFixture as userMe } from 'teambition-sdk-fixture'
 import { mock, restore } from '../utils'
 
 describe('UserApi Spec', () => {

diff --git a/packages/teambition-sdk-request/test/asyncLoadRDB.spec.ts b/packages/teambition-sdk-request/test/asyncLoadRDB.spec.ts
@@ -1,15 +1,15 @@
 import { describe, beforeEach, afterEach, it } from 'tman'
 import { expect } from 'chai'
 import { Subscription } from 'rxjs'
-import { SocketMock } from 'teambition-sdk-mock'
 import { SDK, TaskSchema, PostSchema, LikeSchema } from 'teambition-sdk-core'
 import {
+  SocketMock,
   LikeFixture as like,
   MyFixture,
   PostsFixture,
   TasksFixture,
   UserFixture as userMe,
-} from 'teambition-sdk-fixture'
+} from 'teambition-sdk-testutil'
 
 import { mock, restore, equals } from './utils'
 import { createSdkWithoutRDB, loadRDB, normIfRecurrentEvent, EventGenerator } from './index'

diff --git a/packages/teambition-sdk-request/test/mock/MockFetch.ts b/packages/teambition-sdk-request/test/mock/MockFetch.ts
@@ -1,5 +1,5 @@
 import { SDKFetch } from 'teambition-sdk-core'
-import { Backend } from 'teambition-sdk-mock'
+import { Backend } from 'teambition-sdk-testutil'
 
 function throwIfSlashPath(path: string) {
   if (path.charAt(0) === '/') {

diff --git a/packages/teambition-sdk-fixture/package.json → ...ages/teambition-sdk-testutil/package.json b/packages/teambition-sdk-fixture/package.json → ...ages/teambition-sdk-testutil/package.json
@@ -1,8 +1,8 @@
 {
   "private": true,
-  "name": "teambition-sdk-fixture",
+  "name": "teambition-sdk-testutil",
   "version": "0.8.13",
-  "description": "Front-End SDK (Fixture) for Teambition",
+  "description": "Front-End SDK (TestUtil) for Teambition",
   "main": "./dist/cjs/index.js",
   "typings": "./dist/cjs/index.d.ts",
   "scripts": {
@@ -15,12 +15,17 @@
   "keywords": [
     "teambition",
     "sdk",
-    "teambition-sdk"
+    "teambition-sdk",
+    "mock",
+    "fixture"
   ],
   "author": "[email protected]",
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/teambition/teambition-sdk/issues"
   },
-  "homepage": "https://github.com/teambition/teambition-sdk#readme"
+  "homepage": "https://github.com/teambition/teambition-sdk#readme",
+  "peerDependencies": {
+    "core-js": "^2.4.1"
+  }
 }
diff --git a/...mbition-sdk-fixture/src/events.fixture.ts → ...dk-testutil/src/fixture/events.fixture.ts b/...mbition-sdk-fixture/src/events.fixture.ts → ...dk-testutil/src/fixture/events.fixture.ts
diff --git a/...ambition-sdk-fixture/src/files.fixture.ts → ...sdk-testutil/src/fixture/files.fixture.ts b/...ambition-sdk-fixture/src/files.fixture.ts → ...sdk-testutil/src/fixture/files.fixture.ts
diff --git a/packages/teambition-sdk-fixture/src/index.ts → ...mbition-sdk-testutil/src/fixture/index.ts b/packages/teambition-sdk-fixture/src/index.ts → ...mbition-sdk-testutil/src/fixture/index.ts
diff --git a/...eambition-sdk-fixture/src/like.fixture.ts → ...-sdk-testutil/src/fixture/like.fixture.ts b/...eambition-sdk-fixture/src/like.fixture.ts → ...-sdk-testutil/src/fixture/like.fixture.ts
diff --git a/.../teambition-sdk-fixture/src/my.fixture.ts → ...on-sdk-testutil/src/fixture/my.fixture.ts b/.../teambition-sdk-fixture/src/my.fixture.ts → ...on-sdk-testutil/src/fixture/my.fixture.ts
diff --git a/...ambition-sdk-fixture/src/posts.fixture.ts → ...sdk-testutil/src/fixture/posts.fixture.ts b/...ambition-sdk-fixture/src/posts.fixture.ts → ...sdk-testutil/src/fixture/posts.fixture.ts
diff --git a/...ambition-sdk-fixture/src/tasks.fixture.ts → ...sdk-testutil/src/fixture/tasks.fixture.ts b/...ambition-sdk-fixture/src/tasks.fixture.ts → ...sdk-testutil/src/fixture/tasks.fixture.ts
diff --git a/...eambition-sdk-fixture/src/user.fixture.ts → ...-sdk-testutil/src/fixture/user.fixture.ts b/...eambition-sdk-fixture/src/user.fixture.ts → ...-sdk-testutil/src/fixture/user.fixture.ts
diff --git a/packages/teambition-sdk-testutil/src/index.ts b/packages/teambition-sdk-testutil/src/index.ts
@@ -0,0 +1,2 @@
+export * from './mock'
+export * from './fixture'
diff --git a/packages/teambition-sdk-mock/src/backend.ts → ...ambition-sdk-testutil/src/mock/backend.ts b/packages/teambition-sdk-mock/src/backend.ts → ...ambition-sdk-testutil/src/mock/backend.ts
diff --git a/packages/teambition-sdk-mock/src/index.ts → ...teambition-sdk-testutil/src/mock/index.ts b/packages/teambition-sdk-mock/src/index.ts → ...teambition-sdk-testutil/src/mock/index.ts
diff --git a/packages/teambition-sdk-mock/src/mock.ts → .../teambition-sdk-testutil/src/mock/mock.ts b/packages/teambition-sdk-mock/src/mock.ts → .../teambition-sdk-testutil/src/mock/mock.ts
diff --git a/packages/teambition-sdk-mock/src/response.ts → ...mbition-sdk-testutil/src/mock/response.ts b/packages/teambition-sdk-mock/src/response.ts → ...mbition-sdk-testutil/src/mock/response.ts
diff --git a/packages/teambition-sdk-mock/src/socket.ts → ...eambition-sdk-testutil/src/mock/socket.ts b/packages/teambition-sdk-mock/src/socket.ts → ...eambition-sdk-testutil/src/mock/socket.ts
diff --git a/packages/teambition-sdk-mock/src/utils.ts → ...teambition-sdk-testutil/src/mock/utils.ts b/packages/teambition-sdk-mock/src/utils.ts → ...teambition-sdk-testutil/src/mock/utils.ts
diff --git a/...ages/teambition-sdk-fixture/tsconfig.json → ...ges/teambition-sdk-testutil/tsconfig.json b/...ages/teambition-sdk-fixture/tsconfig.json → ...ges/teambition-sdk-testutil/tsconfig.json
@@ -1,21 +1,44 @@
 {
   "compilerOptions": {
     "module": "commonjs",
+    "moduleResolution": "node",
     "outDir": "dist/cjs",
-    "sourceMap": true,
-    "inlineSources": true,
     "target": "ES5",
+
+    "types": [
+      "node"
+    ],
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+
+    "inlineSources": true,
+    "inlineSourceMap": true,
     "declaration": true,
     "diagnostics": true,
     "pretty": true,
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+
+    "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
+    "noImplicitReturns": true,
     "suppressImplicitAnyIndexErrors": true,
-    "moduleResolution": "node",
+
+    "lib": [
+      "es5",
+      "es2015.iterable",
+      "es2015.collection",
+      "es2015.promise",
+      "es2015.core",
+      "dom"
+    ],
     "importHelpers": true,
     "noEmitHelpers": true
   },
   "files": [
     "src/index.ts"
   ]
 }
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from './mock'
		export * from './fixture'