Removed params, helpers and getFirst

elements can be accesed by this.elements

Author: vramana

src/middleware/find.js

@@ -12,7 +12,9 @@ export default function find(selector){
   }
   else elements = TestUtils.scryRenderedDOMComponentsWithTag(this.instance, selector)
 
-  if(elements.length === 1) elements = elements[0]
-  if(!this.helpers.elements) this.helpers.elements = []
-  this.helpers.elements[name || selector] = elements
+  if (Array.isArray(elements) && elements.length === 1) {
+    this.elements[name || selector] = elements[0]
+  } else {
+    this.elements[name || selector] = elements
+  }
 }

src/middleware/simulate.js

@@ -1,9 +1,14 @@
 import React from 'react'
 let { TestUtils } = React.addons
 
-export default function simulate(data){
-  let element = data.element ? this.helpers.elements[data.element] : this
-  element = Array.isArray(element) ? element[0] : element
+export default function simulate(data) {
+  let element
+  if (data.element !== undefined ) {
+    element = Array.isArray(this.elements[data.element]) ?
+      this.elements[data.element][0] : this.elements[data.element]
+  } else {
+    throw new Error(`No element "${data.element}" is in elements`)
+  }
   TestUtils.Simulate[data.method].call(this,
     element,
     data.options || null

src/tests.js

@@ -15,33 +15,28 @@ function Test(component, config) {
     instance = TestUtils.renderIntoDocument(component)
   }
 
-  function getFirst(object) {
-    for (let element in object)
-      return object[element]
-  }
-
   const testComponent = {
     instance,
-    helpers: {},
-    params() {
-      const length = Object.keys(this.helpers).length
-      if (this.helpers.elements && length === 1) {
-        return Object.assign({}, this, this.helpers.elements)
-      }
-      return this
-    },
+    elements: {},
     element(select, callback) {
-      if (!this.helpers) return
-
       let element
       if (typeof select === 'string') {
-        element = this.helpers.elements[select]
+        element = this.elements[select]
         callback.call(this, element)
         return this
       }
 
-      element = getFirst(this.helpers.elements)
-      select.call(this, element)
+      if (Array.isArray(select)) {
+        const args = select.map(elem => this.elements[elem])
+        callback.call(this, ...args)
+        return this
+      }
+
+      if (Object.keys(this.elements).length === 1) {
+        select.call(this, this.elements[Object.keys(this.elements)[0]])
+      } else {
+        throw new Error("There are multiple elements select one")
+      }
       return this
     },
     use(callback, data) {
@@ -58,7 +53,7 @@ function Test(component, config) {
       return this
     },
     test(callback) {
-      const param = this.params()
+      const param = {...this, ...this.elements}
       callback.call(param, param)
       return this
     },

tests/element.jsx

@@ -26,4 +26,14 @@ describe('.element', () => {
       expect(div.length).to.be.equal(2)
     })
   })
+
+  it('should select multiple elements', () => {
+    Test(<TestComponent />)
+    .find('.box')
+    .find('div')
+    .element(['box', 'div'], (box, div) => {
+      expect(div.length).to.be.equal(2)
+      expect(box.props.children).to.be.equal('found me!')
+    })
+  })
 })

tests/find.jsx

@@ -12,15 +12,15 @@ describe('Find middleware', () => {
     Test(<TestComponent/>)
     .find('div')
     .test(function() {
-      expect(this.helpers.elements.div[0].props.children).to.be.equal(undefined)
+      expect(this.elements.div[0].props.children).to.be.equal(undefined)
     })
   })
 
   it('should find p tag with class', () => {
     Test(<TestComponent/>)
     .use(Find, '.box')
     .test(function() {
-      expect(this.helpers.elements.box.props.children).to.be.equal('found me!')
+      expect(this.elements.box.props.children).to.be.equal('found me!')
     })
 
     Test(<TestComponent/>)

tests/setState.jsx

@@ -12,8 +12,8 @@ describe('setState middleware', () => {
     Test(<TestComponent />)
     .use(SetState, {test: 'test'})
     .use(Find, 'div')
-    .test(({helpers}) => {
-      expect(helpers.elements.div[0].props.children).to.be.equal('test')
+    .test(({elements}) => {
+      expect(elements.div[0].props.children).to.be.equal('test')
     })
     .setState({test: 'changed!'})
     .test(function() {

tests/simulate.jsx

@@ -15,9 +15,8 @@ describe('simulate middleware', () => {
     Test(<TestComponent onClick={spy}/>)
     .use(Find, 'div')
     .use(Simulate, {method: 'click', element: 'div'})
-    .test(() => {
-      expect(spy.called).to.be.true
-    })
+
+    expect(spy.called).to.be.true
 
   })
 
@@ -27,9 +26,8 @@ describe('simulate middleware', () => {
     Test(<TestComponent onClick={spy}/>)
     .find('button')
     .simulate({method: 'click', element: 'button'})
-    .test(function() {
-      expect(spy.called).to.be.true
-    })
+
+    expect(spy.called).to.be.true
 
   })