ci(e2e): fixes for e2e

maidsafe · Jul 21, 2020 · f2bcdf3 · f2bcdf3
1 parent 6164b97
commit f2bcdf3
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 51 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -65,6 +65,13 @@ jobs:
       - run: cp ./release/*.dmg ./release/safe_browser-${{ matrix.os }}.dmg
         if: matrix.os == 'macos-latest'
 
+      - name: Archive Everything (we are on a tag build)!
+        if: startsWith(github.ref, 'refs/tags/')
+        uses: actions/upload-artifact@v1
+        with:
+          name: safe_browser-${{ matrix.os }}
+          path: ./release
+
       - name: Archive Artifact!
         if: matrix.os != 'macos-latest' && !startsWith(github.ref, 'refs/tags/')
         uses: actions/upload-artifact@v1

diff --git a/app/components/Tab/Tab.tsx b/app/components/Tab/Tab.tsx
@@ -255,7 +255,7 @@ export class Tab extends Component<TabProps, TabState> {
                 this.pageFaviconUpdated.bind( this )
             );
             webview.addEventListener( 'new-window', this.newWindow.bind( this ) );
-            // webview.addEventListener( 'did-fail-load', this.didFailLoad.bind( this ) );
+            webview.addEventListener( 'did-fail-load', this.didFailLoad.bind( this ) );
             webview.addEventListener(
                 'update-target-url',
                 this.updateTargetUrl.bind( this )
@@ -433,7 +433,7 @@ export class Tab extends Component<TabProps, TabState> {
         const urlObject = stdUrl.parse( url );
         const errorUrl = error.validatedURL;
 
-        logger.info( 'didfail load', error );
+        logger.info( 'didfail load for url', urlObject, error );
         const renderError = ( header, subHeader? ) => {
             const errorAsHtml = ReactDOMServer.renderToStaticMarkup(
                 <Error error={{ header, subHeader }} />
@@ -460,15 +460,17 @@ export class Tab extends Component<TabProps, TabState> {
             try {
                 renderError( 'Page Load Failed' );
             } catch ( scriptError ) {
-                logger.error( scriptError );
+                // not logger due to error contents
+                console.error( scriptError );
             }
             return;
         }
         if ( error && error.errorDescription === 'ERR_INVALID_URL' ) {
             try {
                 renderError( `Invalid URL: ${url}` );
             } catch ( scriptError ) {
-                logger.error( scriptError );
+                // not logger due to error contents
+                console.error( scriptError );
             }
             return;
         }

diff --git a/app/extensions/safe/backgroundProcess/server-routes/safe.tsx b/app/extensions/safe/backgroundProcess/server-routes/safe.tsx
@@ -9,14 +9,14 @@ import { errorConstants } from '$Extensions/safe/err-constants';
 import {
     rangeStringToArray,
     generateResponseString,
-    cleanupNeonError
+    cleanupNeonError,
 } from '$Extensions/safe/utils/safeHelpers';
 import { getHTTPFriendlyData } from '$Extensions/safe/backgroundProcess';
 import { SAFE } from '$Extensions/safe/constants';
 import {
     windowCloseTab,
     addTabEnd,
-    addTabNext
+    addTabNext,
 } from '$Actions/windows_actions';
 
 export const safeRoute = ( store ) => ( {
@@ -29,18 +29,16 @@ export const safeRoute = ( store ) => ( {
             badVersion?: string,
             latestVersion?: string
         ): void => {
-            response
-                .status( ERROR_CODES[type] )
-                .send(
-                    ReactDOMServer.renderToStaticMarkup(
-                        <Error
-                            type={type}
-                            address={address}
-                            badVersin={badVersion}
-                            latestVersion={latestVersion}
-                        />
-                    )
-                );
+            const page = ReactDOMServer.renderToStaticMarkup(
+                <Error
+                    type={type}
+                    address={address}
+                    badVersin={badVersion}
+                    latestVersion={latestVersion}
+                />
+            );
+            logger.debug( 'Constructing error page:', page );
+            response.status( ERROR_CODES[type] ).send( page );
         };
 
         try {
@@ -159,7 +157,7 @@ export const safeRoute = ( store ) => ( {
                     .set( {
                         'Content-Type': data.headers['Content-Type'],
                         'Content-Range': data.headers['Content-Range'],
-                        'Content-Length': data.headers['Content-Length']
+                        'Content-Length': data.headers['Content-Length'],
                     } )
                     .send( data.body );
             }
@@ -179,5 +177,5 @@ export const safeRoute = ( store ) => ( {
             logger.error( message );
             return sendErrorResponse( ERROR_TYPES.BAD_REQUEST, problemLink );
         }
-    }
+    },
 } );
diff --git a/app/extensions/safe/webviewProcess/webviewPreload.ts b/app/extensions/safe/webviewProcess/webviewPreload.ts
@@ -4,7 +4,7 @@ import { XorUrlEncoder } from 'safe-nodejs';
 import { SaferSafe } from '$Extensions/safe/webviewProcess/saferSafe';
 // eslint-disable-next-line import/extensions
 import pkg from '$Package';
-import { logger } from '$Logger';
+// import { logger } from '$Logger';
 
 // shim for rdflib.js
 // eslint-disable-next-line no-underscore-dangle
@@ -26,32 +26,6 @@ class WebIdEvents extends EventEmitter {}
 
 const webIdEventEmitter = new WebIdEvents();
 
-// const createRemoteCall = ( functionName, passedStore ) => {
-//     if ( !functionName ) {
-//         throw new Error( 'Remote calls must have a functionName to call.' );
-//     }
-//
-//     const remoteCall = ( ...args ) =>
-//         new Promise( ( resolve, reject ) => {
-//             const callId = Math.random().toString( 36 );
-//
-//             const theCall = {
-//                 id: callId,
-//                 name: functionName,
-//                 args
-//             };
-//
-//             passedStore.dispatch( remoteCallActions.addRemoteCall( theCall ) );
-//
-//             pendingCalls[theCall.id] = {
-//                 resolve,
-//                 reject
-//             };
-//         } );
-//
-//     return remoteCall;
-// };
-
 /**
  * Set the window var for experimentsEnabled for Tab api import.
  * Also subscrives to the store to watch for updates / trigger reload.
@@ -102,8 +76,6 @@ export const setupWebIdEventEmitter = ( passedStore, win = window ) => {
 
 export const setupSafeAPIs = ( passedStore, win = window ) => {
     const theWindow = win;
-    logger.info( 'Setup up SAFE Dom API... UPDATED' );
-
     // use from passed object if present (for testing)
     theWindow.Safe = theWindow.Safe || SaferSafe;
 

diff --git a/app/logger.ts b/app/logger.ts
@@ -71,8 +71,6 @@ if ( inMainProcess && !isRunningTestCafeProcess ) {
     log.info( 'startedRunningProduction?', startedRunningProduction );
     log.info( 'startedRunningMock?', startedRunningMock );
     log.info( 'isRunningTestCafeProcess?', isRunningTestCafeProcess );
-    log.info( 'isRunningTestCafeProcess?', isRunningTestCafeProcess );
-    log.info( 'isRunningTestCafeProcess?', isRunningTestCafeProcess );
     log.info( '' );
     log.info( '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' );
     log.info( '' );