Merge branch 'feature/test-components' into develop

dweber019 · dweber019 · commit 2dc1675fa8e5 · 2018-02-15T22:15:28.000+01:00
diff --git a/package.json b/package.json
@@ -56,7 +56,7 @@
     ],
     "testEnvironment": "node",
     "moduleNameMapper": {
-      "aurelia-(.*)": "<rootDir>/node_modules/aurelia-$1"
+      "^.*\\.scss$": "<rootDir>/test/unit/stubs/sass-stub.js"
     },
     "collectCoverage": true,
     "collectCoverageFrom": [
@@ -77,7 +77,7 @@
   "devDependencies": {
     "@types/cordova": "^0.0.34",
     "@types/i18next-browser-languagedetector": "^2.0.0",
-    "@types/jest": "^20.0.8",
+    "@types/jest": "^22.1.2",
     "@types/jquery": "^3.2.12",
     "@types/lodash": "^4.14.74",
     "@types/node": "^8.0.26",
@@ -104,8 +104,8 @@
     "http-server": "^0.11.1",
     "img-loader": "^2.0.0",
     "istanbul-instrumenter-loader": "^3.0.0",
-    "jest": "^20.0.4",
-    "jest-cli": "^20.0.4",
+    "jest": "^22.3.0",
+    "jest-cli": "^22.3.0",
     "json-loader": "^0.5.7",
     "loader-utils": "^1.1.0",
     "ncp": "^2.0.0",
@@ -116,7 +116,7 @@
     "protractor": "^5.1.2",
     "sass-loader": "^6.0.6",
     "style-loader": "^0.20.1",
-    "ts-jest": "^20.0.14",
+    "ts-jest": "^22.0.4",
     "ts-node": "^4.1.0",
     "tslib": "^1.7.1",
     "tslint": "^5.7.0",
diff --git a/src/app/resources/elements/show-name/show-name.element.html b/src/app/resources/elements/show-name/show-name.element.html
@@ -1,4 +1,4 @@
 <template class="show-name">
   <h3>Custom global element</h3>
-  <p>Your text: ${ someText }</p>
+  <p>Your text: <span id="fn">${ someText }</span></p>
 </template>
diff --git a/test/jest-pretest.ts b/test/jest-pretest.ts
@@ -1,7 +1,7 @@
 import 'aurelia-polyfills';
 import 'isomorphic-fetch';
-import {Options} from 'aurelia-loader-nodejs';
-import {initialize} from 'aurelia-pal-nodejs';
+import { Options } from 'aurelia-loader-nodejs';
+import { globalize } from 'aurelia-pal-nodejs';
 import * as path from 'path';
 Options.relativeToDir = path.join(__dirname, 'unit');
-initialize();
+globalize();
diff --git a/test/unit/__snapshots__/show-name.spec.ts.snap b/test/unit/__snapshots__/show-name.spec.ts.snap
@@ -0,0 +1,8 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ShowNameComponent should render correctly 1`] = `
+"<body><div><show-name some-text.bind=\\"firstName\\" class=\\"au-target show-name\\" au-target-id=\\"2\\">
+  <h3>Custom global element</h3>
+  <p>Your text: <span id=\\"fn\\">Bob</span></p>
+</show-name></div></body>"
+`;
diff --git a/test/unit/show-name.spec.ts b/test/unit/show-name.spec.ts
@@ -2,28 +2,26 @@ import { bootstrap } from 'aurelia-bootstrapper';
 import { StageComponent } from 'aurelia-testing';
 import { PLATFORM } from 'aurelia-framework';
 
-describe('WelcomeComponent', () => {
+describe('ShowNameComponent', () => {
   let component;
 
   beforeEach(async () => {
     component = StageComponent
       .withResources([
-        PLATFORM.moduleName('../../src/app/modules/welcome/welcome.vm'),
-        PLATFORM.moduleName('../../src/app/resources/converters/date-format.converter')
+        PLATFORM.moduleName('../../src/app/resources/elements/show-name/show-name.element'),
       ])
-      .inView('<welcome-view-model></welcome-view-model>');
+      .inView('<show-name some-text.bind="firstName"></show-name>')
+      .boundTo({ firstName: 'Bob' });
       await component.create(bootstrap);
   });
 
- if (jest) {
-  xit('should render correctly', () => {
+  it('should render correctly', () => {
     expect(document.body.outerHTML).toMatchSnapshot();
   });
- }
 
-  xit('should render first name', () => {
+  it('should render first name', () => {
     const nameElement = document.querySelector('#fn') as HTMLInputElement;
-    expect(nameElement.value).toBe('John');
+    expect(nameElement.innerHTML).toBe('Bob');
   });
 
   afterEach(() => {
diff --git a/test/unit/stubs/sass-stub.js b/test/unit/stubs/sass-stub.js
@@ -0,0 +1 @@
+module.exports = {}
diff --git a/yarn.lock b/yarn.lock
