Make tests check for content in browser context

davidmpaz · davidmpaz · commit 356aaa264347 · 2017-06-24T09:57:50.000+02:00
* Update fixtures to insert content inside #app div
* Add assertion for requestTestPage and files generated.
diff --git a/fixtures/js/render.ts b/fixtures/js/render.ts
@@ -1,5 +1,5 @@
 function render() {
-    document.getElementById('wrapper').innerHTML = "<h1> Hello World!</h1>";
+    document.getElementById('app').innerHTML = "<h1>Welcome to Your TypeScript App</h1>";
 }
 
 export = render;
diff --git a/fixtures/js/render2.tsx b/fixtures/js/render2.tsx
@@ -1,5 +1,5 @@
 function render() {
-    document.getElementById('wrapper').innerHTML = "<h1> Hello World!</h1>";
+    document.getElementById('app').innerHTML = "<h1>Welcome to Your TypeScript App</h1>";
 }
 
 export = render;
diff --git a/lib/test/setup.js b/lib/test/setup.js
@@ -140,6 +140,7 @@ function requestTestPage(webRootDir, scriptSrcs, callback) {
 <head>
 </head>
 <body>
+    <div id="app"></div>
 	${scripts}
 </body>
 </html>
diff --git a/test/functional.js b/test/functional.js
@@ -594,10 +594,29 @@ module.exports = {
                 // check that ts-loader transformed the ts file
                 webpackAssert.assertOutputFileContains(
                     'main.js',
-                    'document.getElementById(\'wrapper\').innerHTML = "<h1> Hello World!</h1>";'
+                    'document.getElementById(\'app\').innerHTML = "<h1>Welcome to Your TypeScript App</h1>";'
                 );
 
-                done();
+                expect(config.outputPath).to.be.a.directory().with.deep.files([
+                    'main.js',
+                    'manifest.json'
+                ]);
+
+                testSetup.requestTestPage(
+                    path.join(config.getContext(), 'www'),
+                    [
+                        'build/main.js'
+                    ],
+                    (browser) => {
+
+                        // assert that the ts module rendered
+                        browser.assert.text('#app h1', 'Welcome to Your TypeScript App');
+                        // make sure the styles are not inline
+                        browser.assert.elements('style', 0);
+
+                        done();
+                    }
+                );
             });
         });
 
@@ -620,9 +639,14 @@ module.exports = {
                 // and also ts-loader did its job
                 webpackAssert.assertOutputFileContains(
                     'main.js',
-                    'document.getElementById(\'wrapper\').innerHTML = "<h1> Hello World!</h1>";'
+                    'document.getElementById(\'app\').innerHTML = "<h1>Welcome to Your TypeScript App</h1>";'
                 );
 
+                expect(config.outputPath).to.be.a.directory().with.deep.files([
+                    'main.js',
+                    'manifest.json'
+                ]);
+
                 done();
             });
         });

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`function render() {`
`2`		`- document.getElementById('wrapper').innerHTML = "<h1> Hello World!</h1>";`
	`2`	`+ document.getElementById('app').innerHTML = "<h1>Welcome to Your TypeScript App</h1>";`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`export = render;`