Merge develop branch (#298)

* Reorganize redux, add address form

- refactor(redux): Reorganize actions and reducers (#212)
- feature(checkout): Add address form to checkout flow (#226)
- test(redux): Add tests for redux actions (#239)

* fixup

package.json

@@ -70,6 +70,7 @@
     "graphql": "~0",
     "graphql-tag": "^2.9.2",
     "identity-obj-proxy": "^3.0.0",
+    "informed": "^1.9.0",
     "intl": "^1.2.5",
     "jest": "^23.4.0",
     "jest-fetch-mock": "^1.4.1",
@@ -93,6 +94,7 @@
     "react-redux": "^5.0.7",
     "react-router-dom": "^4.2.2",
     "redux": "^4.0.0",
+    "redux-actions": "2.6.1",
     "redux-thunk": "^2.3.0",
     "rimraf": "^2.6.2",
     "storybook-readme": "^3.3.0",

packages/venia-concept/src/__mocks__/@magento/peregrine.js → packages/venia-concept/__mocks__/@magento/peregrine.js

@@ -1,5 +1,13 @@
 import { createElement } from 'react';
 
+export const mockRequest = jest.fn();
+
+export const RestApi = {
+    Magento2: {
+        request: mockRequest
+    }
+};
+
 /**
  * the Price component from @magento/peregrine
  * has browser-specific functionality and cannot

packages/venia-concept/package.json

@@ -1,30 +1,30 @@
 {
-    "name": "theme-frontend-venia",
-    "version": "0.1.1",
-    "description": "Venia PWA Concept Theme for Magento 2",
-    "license": "(OSL-3.0 OR AFL-3.0)",
-    "author": "Magento Commerce",
-    "main": "src/index.js",
-    "repository": "github:magento-research/pwa-studio",
-    "bugs": {
-      "url": "https://github.com/magento-research/pwa-studio/issues"
-    },
-    "homepage": "https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept#readme",
-    "scripts": {
-        "build": "webpack --color --env.phase production",
-        "clean": "rimraf web/js",
-        "prepare": "npm-merge-driver install",
-        "start": "webpack-dev-server --progress --color --env.phase development",
-        "start:debug": "node --inspect-brk ./node_modules/.bin/webpack-dev-server --progress --color --env.phase development",
-        "watch": "npm run -s start"
-    },
-    "dependencies": {},
-    "devDependencies": {
-      "@magento/peregrine": "*",
-      "@magento/pwa-buildpack": "*",
-        "npm-merge-driver": "^2.3.5",
-        "rimraf": "^2.6.2",
-        "webpack": "3.11.0",
-        "webpack-dev-server": "2.11.0"
-    }
+  "name": "theme-frontend-venia",
+  "version": "0.1.1",
+  "description": "Venia PWA Concept Theme for Magento 2",
+  "license": "(OSL-3.0 OR AFL-3.0)",
+  "author": "Magento Commerce",
+  "main": "src/index.js",
+  "repository": "github:magento-research/pwa-studio",
+  "bugs": {
+    "url": "https://github.com/magento-research/pwa-studio/issues"
+  },
+  "homepage": "https://github.com/magento-research/pwa-studio/tree/master/packages/venia-concept#readme",
+  "scripts": {
+    "build": "webpack --color --env.phase production",
+    "clean": "rimraf web/js",
+    "prepare": "npm-merge-driver install",
+    "start": "webpack-dev-server --progress --color --env.phase development",
+    "start:debug": "node --inspect-brk ./node_modules/.bin/webpack-dev-server --progress --color --env.phase development",
+    "watch": "npm run -s start"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "@magento/peregrine": "*",
+    "@magento/pwa-buildpack": "*",
+    "npm-merge-driver": "^2.3.5",
+    "rimraf": "^2.6.2",
+    "webpack": "3.11.0",
+    "webpack-dev-server": "2.11.0"
+  }
 }

packages/venia-concept/src/__mocks__/store.js

@@ -0,0 +1,7 @@
+const initialState = {};
+
+export const addReducer = jest.fn();
+export const dispatch = jest.fn();
+export const getState = jest.fn(() => initialState);
+
+export default { addReducer, dispatch, getState };

packages/venia-concept/src/actions/app/__tests__/actions.spec.js

@@ -0,0 +1,20 @@
+import actions from '../actions';
+
+const payload = 'FOO';
+const error = new Error('BAR');
+
+test('toggleDrawer.toString() returns the proper action type', () => {
+    expect(actions.toggleDrawer.toString()).toBe('APP/TOGGLE_DRAWER');
+});
+
+test('toggleDrawer() returns a proper action object', () => {
+    expect(actions.toggleDrawer(payload)).toEqual({
+        type: 'APP/TOGGLE_DRAWER',
+        payload
+    });
+    expect(actions.toggleDrawer(error)).toEqual({
+        type: 'APP/TOGGLE_DRAWER',
+        payload: error,
+        error: true
+    });
+});

packages/venia-concept/src/actions/app/__tests__/asyncActions.spec.js

@@ -0,0 +1,47 @@
+import { dispatch, getState } from 'src/store';
+import actions from '../actions';
+import { closeDrawer, toggleDrawer } from '../asyncActions';
+
+jest.mock('src/store');
+
+const thunkArgs = [dispatch, getState];
+
+afterEach(() => {
+    dispatch.mockClear();
+});
+
+test('toggleDrawer() to return a thunk', () => {
+    expect(toggleDrawer()).toBeInstanceOf(Function);
+});
+
+test('toggleDrawer thunk returns undefined', async () => {
+    const payload = 'FOO';
+    const result = await toggleDrawer(payload)(...thunkArgs);
+
+    expect(result).toBeUndefined();
+});
+
+test('toggleDrawer thunk dispatches actions', async () => {
+    const payload = 'FOO';
+    await toggleDrawer(payload)(...thunkArgs);
+
+    expect(dispatch).toHaveBeenCalledWith(actions.toggleDrawer(payload));
+    expect(dispatch).toHaveBeenCalledTimes(1);
+});
+
+test('closeDrawer() to return a thunk ', () => {
+    expect(closeDrawer()).toBeInstanceOf(Function);
+});
+
+test('closeDrawer thunk returns undefined', async () => {
+    const result = await closeDrawer()(...thunkArgs);
+
+    expect(result).toBeUndefined();
+});
+
+test('closeDrawer thunk dispatches actions', async () => {
+    await closeDrawer()(...thunkArgs);
+
+    expect(dispatch).toHaveBeenCalledWith(actions.toggleDrawer(null));
+    expect(dispatch).toHaveBeenCalledTimes(1);
+});

packages/venia-concept/src/actions/app/actions.js

@@ -0,0 +1,6 @@
+import { createActions } from 'redux-actions';
+
+const prefix = 'APP';
+const actionTypes = ['TOGGLE_DRAWER'];
+
+export default createActions(...actionTypes, { prefix });

packages/venia-concept/src/actions/app/asyncActions.js

@@ -0,0 +1,7 @@
+import actions from './actions';
+
+export const toggleDrawer = name => async dispatch =>
+    dispatch(actions.toggleDrawer(name));
+
+export const closeDrawer = () => async dispatch =>
+    dispatch(actions.toggleDrawer(null));

packages/venia-concept/src/actions/app/index.js

@@ -0,0 +1,2 @@
+export { default } from './actions';
+export * from './asyncActions';