From abb01451e215f38f980b1b43fe730403977308b0 Mon Sep 17 00:00:00 2001
From: "bigopon.777@gmail.com" <bigopon.777@gmail.com>
Date: Tue, 6 Nov 2018 22:25:05 +1100
Subject: [PATCH] fix(package-analyzer-test): fix lint issues, adjust assertion

---
 spec/lib/build/package-analyzer.spec.js | 54 ++++++++++++++++---------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/spec/lib/build/package-analyzer.spec.js b/spec/lib/build/package-analyzer.spec.js
index 73c93b1d1..b0522066e 100644
--- a/spec/lib/build/package-analyzer.spec.js
+++ b/spec/lib/build/package-analyzer.spec.js
@@ -330,15 +330,14 @@ describe('The PackageAnalyzer', () => {
 
   describe('analyze() reads package.json as package metadata -- "browser/module/main" fields analysis', () => {
     let fsConfig;
-    let mockFileNames = ['index.js', 'browser.js', 'module.js'];
-    beforeEach(function __setup__mock_package_json() {
+    beforeEach(function() {
       fsConfig = {};
-      for (const fileName of mockFileNames) {
-        fsConfig[path.join('node_modules/my-package', fileName)] = 'some-content';
-      };
+      fsConfig[path.join('node_modules/my-package', 'index.js')] = 'some-content';
+      fsConfig[path.join('node_modules/my-package', 'browser.js')] = 'some-content';
+      fsConfig[path.join('node_modules/my-package', 'module.js')] = 'some-content';
       fsConfig[project.paths.root] = {};
     });
-      
+
     it('respects browser field over module/main', done => {
       fsConfig[path.join('node_modules/my-package', 'package.json')] = '{ "name": "my-package", "main": "index.js", "browser": "browser.js", "module": "module.js" }';
       mockfs(fsConfig);
@@ -369,23 +368,40 @@ describe('The PackageAnalyzer', () => {
 
     it('respects "module" field over "main", but ignore module with "aurelia-"', done => {
       fsConfig[path.join('node_modules/my-package', 'package.json')] = '{ "name": "my-package", "main": "index.js", "module": "module.js"}';
-      const aureliaPkg = 'aurelia-binding';
-      for (const fileName of mockFileNames) {
-        fsConfig[path.join(`node_modules/${aureliaPkg}`, fileName)] = 'export const content';
-      }
-      fsConfig[path.join(`node_modules/${aureliaPkg}`, 'package.json')] = '"name": "aurelia-binding", "main": "index.js", "module": "module.js"';
 
-      sut.analyze('aurelia-binding')
-        .then(description => {
-          expect(description.metadata.name).toBe('aurelia-binding');
-          expect(description.loaderConfig.path).toBe(`../node_modules/${aureliaPkg}/index.js`);
-          expect(description.loaderConfig.main).toBe('main');
-          done();
-        })
+      fsConfig[path.join('node_modules/aurelia-binding', 'index.js')] = 'some-content';
+      fsConfig[path.join('node_modules/aurelia-binding', 'browser.js')] = 'some-content';
+      fsConfig[path.join('node_modules/aurelia-binding', 'module.js')] = 'some-content';
+      fsConfig[path.join('node_modules/aurelia-binding', 'aurelia-binding.js')] = 'export stuff';
+      fsConfig[path.join('node_modules/aurelia-binding', 'package.json')] = '{ "name": "aurelia-binding", "main": "aurelia-binding.js", "module": "module.js" }';
+
+      fsConfig[path.join('node_modules/aurelia_binding', 'index.js')] = 'some-content';
+      fsConfig[path.join('node_modules/aurelia_binding', 'browser.js')] = 'some-content';
+      fsConfig[path.join('node_modules/aurelia_binding', 'module.js')] = 'some-content';
+      fsConfig[path.join('node_modules/aurelia_binding', 'aurelia-binding.js')] = 'export stuff';
+      fsConfig[path.join('node_modules/aurelia_binding', 'package.json')] = '{ "name": "aurelia_binding", "main": "aurelia-binding.js", "module": "module.js" }';
+      mockfs(fsConfig);
+
+      Promise
+        .all([
+          sut.analyze('aurelia-binding')
+            .then(description => {
+              expect(description.metadata.name).toBe('aurelia-binding');
+              expect(description.loaderConfig.path).toBe('../node_modules/aurelia-binding');
+              expect(description.loaderConfig.main).toBe('aurelia-binding');
+            }),
+          sut.analyze('aurelia_binding')
+            .then(description => {
+              expect(description.metadata.name).toBe('aurelia_binding');
+              expect(description.loaderConfig.path).toBe('../node_modules/aurelia_binding');
+              expect(description.loaderConfig.main).toBe('module');
+            })
+        ])
+        .then(done)
+        .catch(done.fail);
     });
   });
 
-
   it('analyze() supports parent node_modules folder', done => {
     // setup mock package.json
     const fsConfig = {};