adjusting test types

salsita · Feb 17, 2017 · 6a02d0a · 6a02d0a
1 parent a3e8715
commit 6a02d0a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/packages/prism-react/package.json b/packages/prism-react/package.json
@@ -3,8 +3,6 @@
   "version": "0.1.0",
   "description": "Prism bindings for React-Redux",
   "main": "lib/index.js",
-  "module": "es/index.js",
-  "jsnext:main": "es/index.js",
   "typings": "lib/index.d.ts",
   "scripts": {
     "build:commonjs": "tsc -p ./ --module commonjs --outDir lib",

diff --git a/packages/prism-react/src/__tests__/enhanceComponent.test.tsx b/packages/prism-react/src/__tests__/enhanceComponent.test.tsx
@@ -22,20 +22,24 @@ interface SuperModel {
   nested: NestedModel
 };
 
+interface NestTestingModel {
+  foo: SuperModel
+};
+
 interface Action {
   type: string
 };
 
 const HelloWorld = ({ name } : HelloWorldProps) => <div>Hello {name}!</div>;
 const FooBar = ({ onClick, name } : FooBarProps) => <button onClick={onClick}>{name}</button>;
 
-const EnhancedHelloWorld = enhanceComponent<NestedModel>(connect(
+const EnhancedHelloWorld = enhanceComponent<SuperModel, NestedModel>(connect(
   state => ({
     name: state.name
   })
 )(HelloWorld));
 
-const EnhancedFooBar = enhanceComponent(connect(
+const EnhancedFooBar = enhanceComponent<SuperModel, NestedModel>(connect(
   ({ name }) => ({ name }),
   {
     onClick: () => ({ type: 'Bar' })
@@ -72,30 +76,44 @@ describe('enhanceComponent', () => {
   });
 
   it('should allow wrapping all the outgoing actions in redux store context', () => {
-    const store = createStore((value : number = 0, { type } : Action) => {
+    const store = createStore((state : SuperModel = {
+      nested: {
+        name: ''
+      }
+    }, { type } : Action) => {
       if (type === 'Foo.Bar') {
-        return 42;
+        return {
+          ...state,
+          nested: {
+            ...state.nested,
+            name: '42'
+          }
+        };
       } else {
-        return value;
+        return state;
       }
     });
 
     const component = mount(
       <Provider store={store}>
         <EnhancedFooBar
-          selector={value => value}
+          selector={value => value.nested}
           wrapper={type => `Foo.${type}`}
         />
       </Provider>
     );
 
     component.find('button').simulate('click');
 
-    expect(store.getState()).toEqual(42);
+    expect(store.getState()).toEqual({
+      nested: {
+        name: '42'
+      }
+    });
   });
 
   it('should allow nested wrapping & selectors', () => {
-    const appState = {
+    const appState : NestTestingModel = {
       foo: {
         nested: {
           name: 'Tomas Weiss'
@@ -126,7 +144,7 @@ describe('enhanceComponent', () => {
       />
     );
 
-    const EnhancedRoot = enhanceComponent(connect(
+    const EnhancedRoot = enhanceComponent<NestTestingModel, SuperModel>(connect(
       state => state
     )(Root));
 

diff --git a/packages/prism-redux/package.json b/packages/prism-redux/package.json
@@ -3,8 +3,6 @@
   "version": "0.1.0",
   "description": "Prism bindings for Redux",
   "main": "lib/index.js",
-  "module": "es/index.js",
-  "jsnext:main": "es/index.js",
   "typings": "lib/index.d.ts",
   "scripts": {
     "build:commonjs": "tsc -p ./ --module commonjs --outDir lib",

diff --git a/packages/prism/package.json b/packages/prism/package.json
@@ -1,7 +1,7 @@
 {
   "name": "prism",
   "version": "0.1.0",
-  "description": "Prism",
+  "description": "React / Redux action composition made simple",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "scripts": {