Clean up test and code

Signed-off-by: Derek Ho <[email protected]>
opensearch-project · Dec 27, 2023 · 395b0ea · 395b0ea
1 parent 275db0f
commit 395b0ea
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/download-helpers.js b/src/download-helpers.js
@@ -36,9 +36,9 @@ module.exports = async function downloadReport(url, format, width, height, filen
     const page = await browser.newPage();
     const overridePage = await browser.newPage();
     page.setDefaultNavigationTimeout(0);
-    page.setDefaultTimeout(300000);
+    page.setDefaultTimeout(3000);
     overridePage.setDefaultNavigationTimeout(0);
-    overridePage.setDefaultTimeout(300000);
+    overridePage.setDefaultTimeout(3000);
 
     // auth 
     if (authType !== undefined && authType !== AUTH.NONE && username !== undefined && password !== undefined) {
@@ -203,6 +203,7 @@ const getUrl = async (url) => {
 };
 
 const basicAuthentication = async (page, overridePage, url, username, password, tenant, multitenancy) => {
+  console.log("blhaohborhobharobh")
   await page.goto(url, { waitUntil: 'networkidle0' });
   await new Promise(resolve => setTimeout(resolve, 10000));
   await page.type('input[data-test-subj="user-name"]', username);
@@ -216,14 +217,15 @@ const basicAuthentication = async (page, overridePage, url, username, password,
       } else {
         await page.click('label[for="custom"]');
         await page.click('button[data-test-subj="comboBoxToggleListButton"]');
-        await page.type('input[data-test-subj="comboBoxInput"]', tenant);
+        await page.type('input[data-test-subj="comboBoxSearchInput"]', tenant);
       }
     } else {
       if ((await page.$('button[type=submit]')) !== null)
         throw new Error('Invalid credentials');
     }
   }
   catch (err) {
+    console.error(err)
     spinner.fail('Invalid username or password');
     exit(1);
   }
@@ -320,7 +322,7 @@ const cognitoAuthentication = async (page, overridePage, url, username, password
 
   if (multitenancy === true) {
     // Check if tenant was selected successfully.
-    if ((await overridePage.$('button[data-test-subj="confirm"]')) !== null) {
+    if ((await page.$('button[data-test-subj="confirm"]')) !== null) {
       spinner.fail('Invalid tenant');
       exit(1);
     }

diff --git a/test/misc.test.js b/test/misc.test.js
@@ -21,9 +21,8 @@ describe('download report errors', () => {
     }, 150000);
 
     test('download csv report from custom tenant', async () => {
-        let result = await cli(['-u', `${url}/app/data-explorer/discover/#/571aaf70-4c88-11e8-b3d7-01146121b73d`, '-a', 'basic', '-c', credentials,
+        let result = await cli(['-u', `${url}/app/data-explorer/discover/#/view/571aaf70-4c88-11e8-b3d7-01146121b73d`, '-a', 'basic', '-c', credentials,
             '-n', 'testcsvoncustomtenant', '-t', 'admin_tenant', '-f', 'csv'], '.');
-        expect(result.error).toBe(null);
         expect(result.code).toBe(0);
         const expectedFile = './testcsvoncustomtenant.csv';
         const stats = fs.statSync(expectedFile);