fix conflicts

2 files changed, 107 insertions, 18 deletions

diff --git a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
index 3d15df294..773fe1f56 100644
--- a/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
+++ b/ui/app/components/page-container/page-container-footer/page-container-footer.component.js
@@ -5,6 +5,7 @@ import Button from '../../button'
 export default class PageContainerFooter extends Component {
 
   static propTypes = {
+    children: PropTypes.node,
     onCancel: PropTypes.func,
     cancelText: PropTypes.string,
     onSubmit: PropTypes.func,
@@ -19,6 +20,7 @@ export default class PageContainerFooter extends Component {
 
   render () {
     const {
+      children,
       onCancel,
       cancelText,
       onSubmit,
@@ -30,24 +32,32 @@ export default class PageContainerFooter extends Component {
     return (
       <div className="page-container__footer">
 
-        <Button
-          type="default"
-          large
-          className="page-container__footer-button"
-          onClick={e => onCancel(e)}
-        >
-          { cancelText || this.context.t('cancel') }
-        </Button>
-
-        <Button
-          type={submitButtonType || 'primary'}
-          large
-          className="page-container__footer-button"
-          disabled={disabled}
-          onClick={e => onSubmit(e)}
-        >
-          { submitText || this.context.t('next') }
-        </Button>
+        <header>
+          <Button
+            type="default"
+            large
+            className="page-container__footer-button"
+            onClick={e => onCancel(e)}
+          >
+            { cancelText || this.context.t('cancel') }
+          </Button>
+
+          <Button
+            type={submitButtonType || 'primary'}
+            large
+            className="page-container__footer-button"
+            disabled={disabled}
+            onClick={e => onSubmit(e)}
+          >
+            { submitText || this.context.t('next') }
+          </Button>
+        </header>
+
+        {children && (
+          <footer>
+            {children}
+          </footer>
+        )}
 
       </div>
     )
diff --git a/ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js b/ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js
index e69de29bb..64efabab0 100644
--- a/ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js
+++ b/ui/app/components/page-container/page-container-footer/tests/page-container-footer.component.test.js
@@ -0,0 +1,79 @@
+import React from 'react'
+import assert from 'assert'
+import { shallow } from 'enzyme'
+import sinon from 'sinon'
+import Button from '../../../button'
+import PageFooter from '../page-container-footer.component'
+
+describe('Page Footer', () => {
+  let wrapper
+  const onCancel = sinon.spy()
+  const onSubmit = sinon.spy()
+
+  beforeEach(() => {
+    wrapper = shallow(<PageFooter
+      onCancel = {onCancel}
+      onSubmit = {onSubmit}
+      cancelText = {'Cancel'}
+      submitText = {'Submit'}
+      disabled = {false}
+      submitButtonType = {'Test Type'}
+    />)
+  })
+
+  it('renders page container footer', () => {
+    assert.equal(wrapper.find('.page-container__footer').length, 1)
+  })
+
+  it('should render a footer inside page-container__footer when given children', () => {
+    const wrapper = shallow(
+      <PageFooter>
+        <div>Works</div>
+      </PageFooter>,
+      { context: { t: sinon.spy((k) => `[${k}]`) } }
+    )
+
+    assert.equal(wrapper.find('.page-container__footer footer').length, 1)
+  })
+
+  it('renders two button components', () => {
+    assert.equal(wrapper.find(Button).length, 2)
+  })
+
+  describe('Cancel Button', () => {
+
+    it('has button type of default', () => {
+      assert.equal(wrapper.find('.page-container__footer-button').first().prop('type'), 'default')
+    })
+
+    it('has children text of Cancel', () => {
+      assert.equal(wrapper.find('.page-container__footer-button').first().prop('children'), 'Cancel')
+    })
+
+    it('should call cancel when click is simulated', () => {
+      wrapper.find('.page-container__footer-button').first().prop('onClick')()
+      assert.equal(onCancel.callCount, 1)
+    })
+
+  })
+
+  describe('Submit Button', () => {
+
+    it('assigns button type based on props', () => {
+      assert.equal(wrapper.find('.page-container__footer-button').last().prop('type'), 'Test Type')
+    })
+
+    it('has disabled prop', () => {
+      assert.equal(wrapper.find('.page-container__footer-button').last().prop('disabled'), false)
+    })
+
+    it('has children text when submitText prop exists', () => {
+      assert.equal(wrapper.find('.page-container__footer-button').last().prop('children'), 'Submit')
+    })
+
+    it('should call submit when click is simulated', () => {
+      wrapper.find('.page-container__footer-button').last().prop('onClick')()
+      assert.equal(onSubmit.callCount, 1)
+    })
+  })
+})