Update tests to support React 16

NetFrameworkTemplates · Nov 8, 2017 · a4fdb41 · a4fdb41
1 parent 94fadd6
commit a4fdb41
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 41 deletions.
diff --git a/MyApp/MyApp.csproj b/MyApp/MyApp.csproj
@@ -91,6 +91,8 @@
     <None Include="Properties\PublishProfiles\PublishToIIS.pubxml">
       <SubType>Designer</SubType>
     </None>
+    <Content Include="src\test.setup.js" />
+    <Content Include="src\test.shim.js" />
     <Content Include="Web.config" />
     <None Include="Web.Release.config">
       <DependentUpon>Web.config</DependentUpon>

diff --git a/MyApp/package-lock.json b/MyApp/package-lock.json
diff --git a/MyApp/package.json b/MyApp/package.json
@@ -13,7 +13,7 @@
     "test": "jest",
     "test-watch": "jest --watch",
     "test-coverage": "jest --coverage",
-    "update-dtos": "cd src && typescript-ref"
+    "dtos-update": "cd src && typescript-ref"
   },
   "jest": {
     "globals": {
@@ -31,11 +31,16 @@
     "moduleNameMapper": {
       "^.+\\.(css|scss|sass)$": "identity-obj-proxy",
       "^.+\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/src/test.fileMock.js"
-    }
+    },
+    "setupFiles": [
+      "<rootDir>/src/test.shim.js",
+      "<rootDir>/src/test.setup.js"
+    ]
   },
   "dependencies": {
     "bootstrap": "^4.0.0-beta.2",
     "classnames": "^2.2.5",
+    "enzyme-adapter-react-16": "^1.0.4",
     "es6-shim": "^0.35.3",
     "font-awesome": "^4.7.0",
     "react": "^16.0.0",
@@ -56,7 +61,7 @@
     "clean-webpack-plugin": "^0.1.17",
     "copy-webpack-plugin": "^4.2.0",
     "css-loader": "^0.28.7",
-    "enzyme": "^3.1.0",
+    "enzyme": "^3.1.1",
     "extract-text-webpack-plugin": "^3.0.2",
     "file-loader": "^1.1.5",
     "gulp": "^3.9.1",

diff --git a/MyApp/src/home/Hello.test.tsx b/MyApp/src/home/Hello.test.tsx
@@ -12,8 +12,8 @@ describe('<Hello />', () => {
     expect(el.find('h3').text()).toBe("");
 
     el.setState({ result: 'A' }, () => {
-      expect(el.find('h3').text()).toBe("A");
-      done();
+        expect(el.update().find('h3.result').text()).toBe("A");
+        done();
     });
   });
 
@@ -24,7 +24,7 @@ describe('<Hello />', () => {
 
     await (el.instance() as Hello).nameChanged('A');
 
-    expect(el.find('h3').text()).toBe("Hello, A!");
+    expect(el.update().find('h3').text()).toBe("Hello, A!");
   });
 
   it ('Updates heading on keyDown', done => {
@@ -35,7 +35,7 @@ describe('<Hello />', () => {
     el.find('input').simulate('change', { target: { value: 'A' } });
 
     setTimeout(() => {
-      expect(el.find('h3').text()).toBe("Hello, A!");
+      expect(el.update().find('h3').text()).toBe("Hello, A!");
       done();
     }, 100);
   });

diff --git a/MyApp/src/test.setup.js b/MyApp/src/test.setup.js
@@ -0,0 +1,4 @@
+var enzyme = require('enzyme');
+var Adapter = require('enzyme-adapter-react-16');
+
+enzyme.configure({ adapter: new Adapter() });
diff --git a/MyApp/src/test.shim.js b/MyApp/src/test.shim.js
@@ -0,0 +1,3 @@
+global.requestAnimationFrame = function(callback) {
+    setTimeout(callback, 0);
+};
diff --git a/MyApp/webpack.config.vendor.js b/MyApp/webpack.config.vendor.js
@@ -33,7 +33,7 @@ module.exports = (env) => {
         },
         devtool: "source-map",
         output: {
-            path: path.join(__dirname, 'wwwroot', 'dist'),
+            path: root('wwwroot/dist'),
             publicPath: 'dist/',
             filename: '[name].dll.js',
             library: '[name]_[hash]',