Merge branch 'master' into transactionControllerRefractor

3 files changed, 137 insertions, 20 deletions

diff --git a/test/integration/index.js b/test/integration/index.js
index 85f91d92b..e089fc39b 100644
--- a/test/integration/index.js
+++ b/test/integration/index.js
@@ -1,23 +1,19 @@
-var fs = require('fs')
-var path = require('path')
-var browserify = require('browserify')
-var tests = fs.readdirSync(path.join(__dirname, 'lib'))
-var bundlePath = path.join(__dirname, 'bundle.js')
+const fs = require('fs')
+const path = require('path')
+const browserify = require('browserify')
+const tests = fs.readdirSync(path.join(__dirname, 'lib'))
+const bundlePath = path.join(__dirname, 'bundle.js')
 
-var b = browserify()
+const b = browserify()
 
-// Remove old bundle
-try {
-  fs.unlinkSync(bundlePath)
+const writeStream = fs.createWriteStream(bundlePath)
 
-  var writeStream = fs.createWriteStream(bundlePath)
-
-  tests.forEach(function (fileName) {
-    b.add(path.join(__dirname, 'lib', fileName))
-  })
-
-  b.bundle().pipe(writeStream)
-} catch (e) {
-  console.error('Integration build failure', e)
-}
+tests.forEach(function (fileName) {
+  b.add(path.join(__dirname, 'lib', fileName))
+})
 
+b.bundle()
+.pipe(writeStream)
+.on('error', (err) => {
+  throw err
+})
diff --git a/test/integration/lib/first-time.js b/test/integration/lib/first-time.js
index 6c8cedbac..0e4b802da 100644
--- a/test/integration/lib/first-time.js
+++ b/test/integration/lib/first-time.js
@@ -90,7 +90,13 @@ QUnit.test('render init screen', function (assert) {
     return wait()
   }).then(function (){
 
-    var qrButton = app.find('.fa.fa-qrcode')[0]
+    var qrButton = app.find('.fa.fa-ellipsis-h')[0] // open account settings dropdown
+    qrButton.click()
+
+    return wait(1000)
+  }).then(function (){
+
+    var qrButton = app.find('.dropdown-menu-item')[1] // qr code item
     qrButton.click()
 
     return wait(1000)
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);
+  });
+});