Merge pull request #601 from digeff/new_int_test

Added new integration test
microsoft · Feb 19, 2018 · 3d0b4c0 · 3d0b4c0
2 parents 02c240f + a36209d
commit 3d0b4c0
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/test/int/breakOnLoad.test.ts b/test/int/breakOnLoad.test.ts
@@ -156,6 +156,29 @@ function runCommonTests(breakOnLoadStrategy: string) {
 
             await dc.hitBreakpointUnverified({ url, webRoot: testProjectRoot }, { path: scriptPath, line: bpLine, column: bpCol });
         });
+
+        test('Hits breakpoints on the first line of two scripts', async () => {
+            const testProjectRoot = path.join(DATA_ROOT, 'breakOnLoad_javaScript');
+            const scriptPath = path.join(testProjectRoot, 'src/script.js');
+            const script2Path = path.join(testProjectRoot, 'src/script2.js');
+
+            server = createServer({ root: testProjectRoot });
+            server.listen(7890);
+
+            const url = 'http://localhost:7890/index.html';
+
+            const bpLine = 1;
+            const bpCol = 1;
+
+            await dc.hitBreakpointUnverified({ url, webRoot: testProjectRoot }, { path: scriptPath, line: bpLine, column: bpCol });
+            await dc.setBreakpointsRequest({
+                lines: [bpLine],
+                breakpoints: [{ line: bpLine, column: bpCol }],
+                source: { path: script2Path }
+            });
+            await dc.continueRequest();
+            await dc.assertStoppedLocation('breakpoint', { path: script2Path, line: bpLine, column: bpCol })
+        });
     });
 }
 

diff --git a/testdata/breakOnLoad_javaScript/index.html b/testdata/breakOnLoad_javaScript/index.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <script src="src/script.js"></script>
+    <script src="src/script2.js"></script>
   </head>
   <body>
     <h1>testdata/breakOnLoad_javaScript</h1>

diff --git a/testdata/breakOnLoad_javaScript/src/script2.js b/testdata/breakOnLoad_javaScript/src/script2.js
@@ -0,0 +1,7 @@
+document.write("Script2.js file"); console.log("Hi2");
+var a = 1;
+var b = 1; fun2();
+
+function fun2() {
+    return true;
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ @@
     <html>
       <head>
         <script src="src/script.js"></script>
+        <script src="src/script2.js"></script>
       </head>
       <body>
         <h1>testdata/breakOnLoad_javaScript</h1>
@@ Expand Down @@