Merge pull request #232 from Adslot/upgrade-alexandria-and-expose-cov…

…erage

chore: upgrade deps, fix build errors, increase coverage

cfg/test.js

@@ -7,6 +7,7 @@ module.exports = {
     cheerio: 'window',
     'react/lib/ExecutionEnvironment': true,
     'react/lib/ReactContext': true,
+    'react/addons': true,
   },
   module: {
     loaders: [

karma.conf.js

@@ -23,6 +23,7 @@ module.exports = function configureKarma(config) {
       reporters: [
         { type: 'lcov', subdir: '.' },
         { type: 'json', subdir: '.' },
+        { type: 'text-summary', subdir: '.' },
       ],
     },
     webpack: webpackCfg,

package.json

@@ -35,7 +35,7 @@
   ],
   "author": "Adslot",
   "devDependencies": {
-    "alexandria-adslot": "^2.7.0",
+    "alexandria-adslot": "^2.8.0",
     "autoprefixer": "^6.3.4",
     "babel-core": "^6.7.2",
     "babel-eslint": "^6.0.0",

src/examples/components/forms.js

@@ -162,7 +162,7 @@ ExampleForm.propTypes = {
   validateAndSave: PropTypes.func.isRequired,
 };
 
-const mapStateToProps = (state) => ({
+export const mapStateToProps = (state) => ({
   formValues: state.form,
   isSubmitting: state.visibility.isSubmitting,
 });

test/components/MainTest.js

@@ -111,6 +111,11 @@ describe('MainComponent', () => {
     expect(listPickerElement.prop('labelFormatter')({ givenName: 'John', surname: 'Doe' })).to.equal('John Doe');
   });
 
+  it('should pass a custom controllerFormatter into the ListPicker', () => {
+    const listPickerElement = MainComponent.find(ListPicker).first();
+    expect(listPickerElement.prop('controllerFormatter')().type).to.equal(Checkbox);
+  });
+
   it('should pass a custom initialSelection into the ListPicker', () => {
     const listPickerElement = MainComponent.find(ListPicker).first();
     expect(listPickerElement.prop('initialSelection')).to.have.length(1);

test/examples/components/formsTest.js

@@ -2,7 +2,7 @@ import _ from 'lodash';
 import React from 'react';
 import sinon from 'sinon';
 import { Button, PageTitle, Select, Checkbox } from 'components/distributionEntry';
-import { ExampleFormPure } from 'examples/components/forms';
+import { ExampleFormPure, mapStateToProps } from 'examples/components/forms';
 import { shallow } from 'enzyme';
 
 describe('ExampleForm', () => {
@@ -96,4 +96,15 @@ describe('ExampleForm', () => {
 
     expect(mockValidateAndSave.calledOnce).to.equal(true);
   });
+
+  it('should map state to props', () => {
+    const state = {
+      form: { foo: 'bar' },
+      visibility: { isSubmitting: true },
+    };
+    expect(mapStateToProps(state)).to.deep.equal({
+      formValues: { foo: 'bar' },
+      isSubmitting: true,
+    });
+  });
 });

test/examples/components/selectsTest.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import { Select } from 'components/distributionEntry';
+import ExampleSelect from 'examples/components/selects';
+import { shallow } from 'enzyme';
+
+describe('ExampleSelect', () => {
+  it('should render two react-select components with defaults', () => {
+    const component = shallow(<ExampleSelect />);
+    const selectComponents = component.find(Select);
+    expect(selectComponents).to.have.length(2);
+    expect(selectComponents.first().prop('clearable')).to.equal(false);
+    expect(selectComponents.first().prop('name')).to.equal('countriesSelect');
+    expect(selectComponents.last().prop('clearable')).to.equal(true);
+    expect(selectComponents.last().prop('name')).to.equal('flavoursSelect');
+  });
+});