Merge pull request #5 from ArgLab/integration-testing

Integration testing
ArgLab · Nov 17, 2020 · 5767ffb · 5767ffb
2 parents 16f2b83 + 39693bb
commit 5767ffb
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 1 deletion.
diff --git a/gui.js b/gui.js
@@ -91,7 +91,8 @@ var StageHandleMorph;
 var PaletteHandleMorph;
 var AgentMorph;
 
-var SERVER_URL = SERVER_URL || window.location.origin;
+var SERVER_URL = window.location.origin || SERVER_URL;
+// console.error("SERVER_URL: ", SERVER_URL);
 var SERVER_ADDRESS = SERVER_URL.replace(/^.*\/\//, '');
 function ensureFullUrl(url) {
     // if it's not a full path attach serverURL to the front

diff --git a/index.test.html b/index.test.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<!-- Used to manually switch to dev mode on a production deployment -->
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>NetsBlox</title>
+        <link rel="shortcut icon" href="favicon.ico">
+        <script type="text/javascript">
+            var REMOTE_SERVER_URL = "flecks.csc.ncsu.edu:9000",
+                SERVER_URL = REMOTE_SERVER_URL || window.location.origin, // connect to the remote server or fall back to the local server
+                SERVER_ADDRESS = SERVER_URL.replace(/^.*\/\//, ''),
+                CLIENT_ID = '_netsblox' + new Date().getTime(); // generate a client_id w/ low collision probability
+        </script>
+        <script type="text/javascript" src="utils.js"></script>
+        <script type="text/javascript" src="polyfill.js"></script>
+        <script type="text/javascript" src="morphic.js"></script>
+        <script type="text/javascript" src="locale.js"></script>
+        <script type="text/javascript" src="widgets.js"></script>
+        <script type="text/javascript" src="blocks.js"></script>
+        <script type="text/javascript" src="blocks-ext.js"></script>
+        <script type="text/javascript" src="threads.js"></script>
+        <script type="text/javascript" src="objects.js"></script>
+        <script type="text/javascript" src="gui.js"></script>
+        <script type="text/javascript" src="paint.js"></script>
+        <script type="text/javascript" src="lists.js"></script>
+        <script type="text/javascript" src="byob.js"></script>
+        <script type="text/javascript" src="tables.js"></script>
+        <script type="text/javascript" src="xml.js"></script>
+        <script type="text/javascript" src="store.js"></script>
+        <script type="text/javascript" src="cloud.js"></script>
+        <script type="text/javascript" src="sha512.js"></script>
+        <script type="text/javascript" src="actions.js"></script>
+        <script type="text/javascript" src="undo.js"></script>
+        <script type="text/javascript" src="FileSaver.min.js"></script>
+        <script type="text/javascript" src="message-inputs.js"></script>
+        <script type="text/javascript" src="message-listeners.js"></script>
+
+        <script type="text/javascript" src="widgets-ext.js"></script>
+        <script type="text/javascript" src="objects-ext.js"></script>
+        <script type="text/javascript" src="gui-ext.js"></script>
+        <script type="text/javascript" src="netscloud.js"></script>
+        <script type="text/javascript" src="threads-ext.js"></script>
+
+        <!-- Additional Components-->
+        <script type="text/javascript" src="websockets.js"></script>
+        <script type="text/javascript" src="messages.js"></script>
+        <script type="text/javascript" src="room.js"></script>
+        <script type="text/javascript" src="netsblox.js"></script>
+        <script type="text/javascript" src="on-message.js"></script>
+
+        <!-- Snap overrides -->
+        <script type="text/javascript" src="store-ext.js"></script>
+        <script type="text/javascript" src="actions-ext.js"></script>
+
+        <script type="text/javascript" src="main.js"></script>
+    </head>
+    <body style="margin: 0;">
+        <canvas id="world" tabindex="1" style="position: absolute;" ></canvas>
+    </body>
+</html>
diff --git a/main.js b/main.js
@@ -14,6 +14,7 @@ window.onload = function () {
         // gets user info: username, email
         var getProfile = function() {
             const request = new XMLHttpRequest();
+            // console.error("Attempting POST to ", `${SERVER_URL}/api`);
             request.open('POST', `${SERVER_URL}/api`, true);
             request.withCredentials = true;
             const data = {
@@ -23,6 +24,7 @@ window.onload = function () {
             };
             return utils.requestPromise(request, data)
                 .then(function(res) {
+                    // console.error("Error Message", res);
                     if (!res.responseText) throw new Error('Access denied. You are not logged in.');
                     let user = JSON.parse(res.responseText);
                     return user;

diff --git a/websockets.js b/websockets.js
@@ -11,6 +11,10 @@ var WebSocketManager = function (ide) {
     this.processes = [];  // Queued processes to start
     this._protocol = SERVER_URL.substring(0,5) === 'https' ? 'wss:' : 'ws:';
     this.url = this._protocol + '//' + SERVER_ADDRESS;
+    // console.error('SERVER_URL:     ', SERVER_URL);
+    // console.error('SERVER_ADDRESS: ', SERVER_ADDRESS);
+    // console.error('Websocket URL:  ', this.url);
+    // console.error('window.location:', window.location.origin);
     this.lastSocketActivity = Date.now();
     this._connectWebSocket();
     this.version = Date.now();