Merge pull request #13 from testiumjs/mixin-require

Fixin mixin require logic

Author: dbushong

.testiumrc

@@ -2,5 +2,8 @@
   "launch": true,
   "app": {
     "command": "testium-example-app"
+  },
+  "mixins": {
+    "browser": [ "test/mixin.js", "test-mixin-module" ]
   }
 }

lib/testium-driver-sync.js

@@ -42,8 +42,24 @@ var Assertions = require('./assert');
 
 function applyMixin(obj, mixin) {
   debug('Applying mixin to %s', obj.constructor.name, mixin);
-  var mixinFile = path.resolve(process.cwd(), mixin);
-  _.extend(obj, require(mixinFile));
+  // this is all to be bug-compatible with our old implementation, which
+  // would parse a mixin path of "test/blah" the same as "./test/blah"
+  var cwd = process.cwd();
+  var paths = [path.resolve(cwd, mixin), path.resolve(cwd, 'node_modules', mixin)];
+  var mixins;
+  _.forEach(paths, function eachFile(mixinFile) {
+    try {
+      mixins = require(mixinFile); // eslint-disable-line global-require
+      return false;
+    } catch (err) {
+      if (err.code !== 'MODULE_NOT_FOUND') throw err;
+      return undefined;
+    }
+  });
+  if (!mixins) {
+    throw new Error('couldn\'t find ' + mixin + ' in ' + paths.join(' or '));
+  }
+  _.extend(obj, mixins);
 }
 
 function applyMixins(obj, mixins) {

package.json

@@ -42,7 +42,8 @@
     "nlm": "^2.0.0",
     "node-static": "~0.7.7",
     "testium-core": "^1.3.0",
-    "testium-example-app": "^2.1.0"
+    "testium-example-app": "^2.1.0",
+    "test-mixin-module": "file:./test/test-mixin-module"
   },
   "author": {
     "name": "Groupon",

test/integration/element.test.js

@@ -139,7 +139,7 @@ describe('element', () => {
       const error = assert.throws(() =>
         browser.assert.elementLacksText('.only', 'only'));
 
-      const expected = 'Assertion failed: elementLacksText: .only\nnotInclude expected needle not to be found in haystack\n- needle: \"only\"\nhaystack: \"only one here\"';
+      const expected = 'Assertion failed: elementLacksText: .only\nnotInclude expected needle not to be found in haystack\n- needle: \"only\"\n haystack: \"only one here\"';
       assert.equal(expected, stripColors(error.message));
     });
   });
@@ -165,7 +165,7 @@ describe('element', () => {
       const error = assert.throws(() =>
         browser.assert.elementLacksValue('#text-input', 'initialvalue'));
 
-      const expected = 'Assertion failed: elementLacksValue: #text-input\nnotInclude expected needle not to be found in haystack\n- needle: \"initialvalue\"\nhaystack: \"initialvalue\"';
+      const expected = 'Assertion failed: elementLacksValue: #text-input\nnotInclude expected needle not to be found in haystack\n- needle: \"initialvalue\"\n haystack: \"initialvalue\"';
       assert.equal(expected, stripColors(error.message));
     });
   });

test/integration/mixin.test.js

@@ -0,0 +1,15 @@
+import { getBrowser } from '../mini-testium-mocha';
+import assert from 'assertive';
+
+describe('mixin', () => {
+  let browser;
+  before(async () => (browser = await getBrowser()));
+
+  it('exposes the relative path mixed-in method', () => {
+    assert.equal(10, browser.mixedInMethod());
+  });
+
+  it('exposes the external module mixed-in method', () => {
+    assert.equal(42, browser.anotherMethod());
+  });
+});

test/mixin.js

@@ -0,0 +1,7 @@
+exports.mixedInBaseMethod = function mixedInBaseMethod(numbers) {
+  return this.evaluate(`return ${numbers.join(' + ')}`);
+};
+
+exports.mixedInMethod = function mixedInMethod() {
+  return this.mixedInBaseMethod([1, 2, 3, 4]);
+};

test/test-mixin-module/index.js

@@ -0,0 +1,3 @@
+exports.anotherMethod = function anotherMethod() {
+  return 42;
+};

test/test-mixin-module/package.json

@@ -0,0 +1,5 @@
+{
+  "name": "test-mixin-module",
+  "version": "0.0.0",
+  "description": "Mixin Fake Test Module"
+}