Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial

3 files changed, 132 insertions, 4 deletions

diff --git a/test/unit/actions/tx_test.js b/test/unit/actions/tx_test.js
index 0ea1bfdc7..67c72e9a5 100644
--- a/test/unit/actions/tx_test.js
+++ b/test/unit/actions/tx_test.js
@@ -45,13 +45,15 @@ describe('tx confirmation screen', function () {
       before(function (done) {
         actions._setBackgroundConnection({
           approveTransaction (txId, cb) { cb('An error!') },
-          cancelTransaction (txId) { /* noop */ },
+          cancelTransaction (txId, cb) { cb() },
           clearSeedWordCache (cb) { cb() },
         })
 
-        const action = actions.cancelTx({value: firstTxId})
-        result = reducers(initialState, action)
-        done()
+        actions.cancelTx({value: firstTxId})((action) => {
+          result = reducers(initialState, action)
+          done()
+        })
+        
       })
 
       it('should transition to the account detail view', function () {
diff --git a/test/unit/nodeify-test.js b/test/unit/nodeify-test.js
index 06241334d..537dae605 100644
--- a/test/unit/nodeify-test.js
+++ b/test/unit/nodeify-test.js
@@ -17,4 +17,15 @@ describe('nodeify', function () {
       done()
     })
   })
+
+  it('should throw if the last argument is not a function', function (done) {
+    const nodified = nodeify(obj.promiseFunc, obj)
+    try {
+      nodified('baz')
+      done(new Error('should have thrown if the last argument is not a function'))
+    } catch (err) {
+      assert.equal(err.message, 'callback is not a function')
+      done()
+    }
+  })
 })
diff --git a/test/unit/responsive/components/dropdown-test.js b/test/unit/responsive/components/dropdown-test.js
new file mode 100644
index 000000000..3ad2c390e
--- /dev/null
+++ b/test/unit/responsive/components/dropdown-test.js
@@ -0,0 +1,115 @@
+var assert = require('assert');
+
+const additions = require('react-testutils-additions');
+const h = require('react-hyperscript');
+const ReactTestUtils = require('react-addons-test-utils');
+const sinon = require('sinon');
+const path = require('path');
+const Dropdown = require(path.join(__dirname, '..', '..', '..', '..', 'ui', 'app', 'components', 'dropdown.js')).Dropdown;
+const DropdownMenuItem = require(path.join(__dirname, '..', '..', '..', '..', 'ui', 'app', 'components', 'dropdown.js')).DropdownMenuItem;
+
+describe('Dropdown components', function () {
+  let onClickOutside;
+  let closeMenu;
+  let onClick;
+
+  let dropdownComponentProps;
+  const renderer = ReactTestUtils.createRenderer()
+  beforeEach(function () {
+    onClickOutside = sinon.spy();
+    closeMenu = sinon.spy();
+    onClick = sinon.spy();
+
+    dropdownComponentProps = {
+      isOpen: true,
+      zIndex: 11,
+      onClickOutside,
+      style: {
+        position: 'absolute',
+        right: 0,
+        top: '36px',
+      },
+      innerStyle: {},
+    }
+  });
+
+  it('can render two items', function () {
+    const dropdownComponent = h(
+      Dropdown,
+      dropdownComponentProps,
+      [
+        h('style', `
+          .drop-menu-item:hover { background:rgb(235, 235, 235); }
+          .drop-menu-item i { margin: 11px; }
+        `),
+        h(DropdownMenuItem, {
+          closeMenu,
+          onClick,
+        }, 'Item 1'),
+        h(DropdownMenuItem, {
+          closeMenu,
+          onClick,
+        }, 'Item 2'),
+      ]
+    )
+
+    const component = additions.renderIntoDocument(dropdownComponent);
+    renderer.render(dropdownComponent);
+    const items = additions.find(component, 'li');
+    assert.equal(items.length, 2);
+  });
+
+  it('closes when item clicked', function() {
+    const dropdownComponent = h(
+      Dropdown,
+      dropdownComponentProps,
+      [
+        h('style', `
+          .drop-menu-item:hover { background:rgb(235, 235, 235); }
+          .drop-menu-item i { margin: 11px; }
+        `),
+        h(DropdownMenuItem, {
+          closeMenu,
+          onClick,
+        }, 'Item 1'),
+        h(DropdownMenuItem, {
+          closeMenu,
+          onClick,
+        }, 'Item 2'),
+      ]
+    )
+    const component = additions.renderIntoDocument(dropdownComponent);
+    renderer.render(dropdownComponent);
+    const items = additions.find(component, 'li');
+    const node = items[0];
+    ReactTestUtils.Simulate.click(node);
+    assert.equal(closeMenu.calledOnce, true);
+  });
+
+  it('invokes click handler when item clicked', function() {
+    const dropdownComponent = h(
+      Dropdown,
+      dropdownComponentProps,
+      [
+        h('style', `
+          .drop-menu-item:hover { background:rgb(235, 235, 235); }
+          .drop-menu-item i { margin: 11px; }
+        `),
+        h(DropdownMenuItem, {
+          closeMenu,
+          onClick,
+        }, 'Item 1'),
+        h(DropdownMenuItem, {
+          closeMenu,
+          onClick,
+        }, 'Item 2'),
+      ]
+    )
+    const component = additions.renderIntoDocument(dropdownComponent);
+    renderer.render(dropdownComponent);
+    const items = additions.find(component, 'li');
+    const node = items[0];
+    ReactTestUtils.Simulate.click(node);
+    assert.equal(onClick.calledOnce, true);
+  });
+});