resources: Update cypress tets

Author: Harshil2107

cypress/e2e/searchPage.cy.js

@@ -5,7 +5,6 @@ describe('Search page', () => {
         cy.interceptAll()
         cy.visit('/resources')
         cy.waitAuto()
-        cy.waitAuto()
         window.localStorage.setItem('CookieConsent', "{\"userPreference\":\"all\"}")
     })
 
@@ -112,6 +111,7 @@ describe('Search page', () => {
     })
 
     it('checks if changing page size works', () => {
+        // cy.waitAuto()
         cy.get('.results-sortBy-row').find('select').first().select('25')
         cy.waitAuto()
         // cy.wait(['@kiwi', '@resources', '@mongo'])

cypress/fixtures/filters.json

@@ -1,26 +1,24 @@
- [
-        {
-            "_id": null,
-            "category": [
-                "workload",
-                "simpoint",
-                "disk_image",
-                "binary",
-                "checkpoint",
-                "bootloader",
-                "resource",
-                "kernel"
-            ],
-            "architecture": [
-                "X86",
-                "ARM",
-                "MIPS",
-                "RISCV",
-                "POWER",
-                "SPARC"
-            ],
-            "gem5_versions": [
-                "23.0"
-            ]
-        }
+{
+    "_id": null,
+    "category": [
+        "workload",
+        "simpoint",
+        "disk_image",
+        "binary",
+        "checkpoint",
+        "bootloader",
+        "resource",
+        "kernel"
+    ],
+    "architecture": [
+        "X86",
+        "ARM",
+        "MIPS",
+        "RISCV",
+        "POWER",
+        "SPARC"
+    ],
+    "gem5_versions": [
+        "23.0"
     ]
+}

cypress/support/commands.js

@@ -33,13 +33,16 @@ Cypress.Commands.add('assertValueCopiedToClipboard', value => {
 })
 
 Cypress.Commands.add('interceptAll', () => {
+    // console.log('Intercepted:', req.method, req.url)
     cy.intercept('GET', /https.*json$/).as('jsonLink')
     cy.intercept('GET', /^\/\w*\.json$/).as('jsonLocal')
     cy.intercept('GET', '**/api/resources/find-resources-in-batch*', (req) => {
         const url = new URL(req.url);
         const ids = url.searchParams.getAll('id');
         const versions = url.searchParams.getAll('resource_version');
-        
+        console.log("in find", url)
+        console.log(ids)
+        console.log(versions)
         // Check for specific resource requests
         if (ids.includes('arm64-ubuntu-20.04-boot')) {
             const versionIndex = ids.indexOf('arm64-ubuntu-20.04-boot');
@@ -54,33 +57,22 @@ Cypress.Commands.add('interceptAll', () => {
                     fixture: 'getResource.json'
                 })
             } else {
-                req.reply({
-                    documents: [],
-                })
+                req.reply([])
             }
         } else {
-            req.reply({
-                documents: [],
-            })
+            req.reply([])
         }
     }).as('find')
-     cy.intercept('GET', '**/api/resources/search*', (req) => {
+    cy.intercept('GET', '**/api/resources/search*', (req) => {
         const url = new URL(req.url);
         const containsStr = url.searchParams.get('contains-str');
         const mustInclude = url.searchParams.get('must-include');
         const pageSize = parseInt(url.searchParams.get('page-size')) || 10;
         const page = parseInt(url.searchParams.get('page')) || 1;
-        
+        console.log("in cypress")
         console.log('Search params:', { containsStr, mustInclude, pageSize, page });
 
-        // Handle different search scenarios based on your old pipeline logic
-        if (!containsStr && !mustInclude) {
-            // Empty search - equivalent to pipeline length 5
-            req.reply({
-                documents: [],
-                totalCount: 0
-            })
-        } else if (mustInclude) {
+        if (mustInclude) {
             // Parse must-include filters
             const filters = mustInclude.split(';').reduce((acc, filter) => {
                 const [field, ...values] = filter.split(',');
@@ -89,36 +81,46 @@ Cypress.Commands.add('interceptAll', () => {
             }, {});
 
             if (filters.category) {
+                console.log("category")
                 req.reply({
                     fixture: 'searchDiskimage.json'
                 })
             } else if (filters.architecture) {
+                console.log("architecture")
                 req.reply({
                     fixture: 'searchArchitecture.json'
                 })
+            } else if (filters.tags) {
+                req.reply({
+                fixture: 'searchTags.json'
+                })
             } else {
+                console.log("exact")
                 req.reply({
                     fixture: 'searchExact.json'
                 })
             }
-        } else if (containsStr) {
+        } else if (pageSize) {
             // Basic search with different page sizes
             if (pageSize === 25) {
+                console.log("page 25")
                 req.reply({
                     fixture: 'search25.json'
                 })
             } else {
+                console.log("default page exact")
                 req.reply({
                     fixture: 'searchExact.json'
                 })
             }
         } else {
+            console.log("else")
             req.reply({
                 documents: [],
                 totalCount: 0
             })
         }
-    }).as('search')
+    }).as('mongo')
 
     // Intercept filters request (replaces old MongoDB aggregate for filters)
     cy.intercept('GET', '**/api/resources/filters*', {
@@ -129,19 +131,19 @@ Cypress.Commands.add('interceptAll', () => {
 Cypress.Commands.add('waitFirst', () => {
     const resource = Object.keys(Cypress.env('SOURCES'))[0]
     if (Cypress.env('SOURCES')[resource].isMongo) {
-        cy.wait(['@search'])
+        // cy.wait(['@mongo'])
     } else {
         cy.waitJSON(Cypress.env('SOURCES')[resource].url.includes('http'))
     }
     return cy.wrap(Cypress.env('SOURCES')[resource].isMongo)
 })
 
 Cypress.Commands.add('waitAll', value => {
-    cy.wait(['@kiwi', '@resources', '@search', '@filters'])
+    cy.wait(['@kiwi', '@resources', '@filters'])
 })
 
 Cypress.Commands.add('waitMongo', () => {
-    cy.wait(['@search', '@filters'])
+    cy.wait(['@filters'])
 })
 
 Cypress.Commands.add('waitJSON', (isUrl) => {
@@ -154,9 +156,10 @@ Cypress.Commands.add('waitJSON', (isUrl) => {
 
 Cypress.Commands.add('waitAuto', () => {
     const resources = Cypress.env('SOURCES')
+    console.log("resouces", resources)
     Object.keys(resources).forEach((i) => {
         if (resources[i].isMongo) {
-            cy.wait(['@search'])
+            cy.wait(['@mongo'])
         } else {
             cy.waitJSON(resources[i].url.includes('http'))
         }

pages/api/mongodb/getResourceByID.js

@@ -15,8 +15,10 @@ async function getResourceByID(url, id, version = null) {
 
     let params = new URLSearchParams();
     params.append("id", id)
-    if (version == null) {
+    if (version != null) {
         params.append("resource_version", version)
+    } else {
+        params.append("resource_version", "None")
     }
 
     const res = await fetch(`${url}/find-resources-in-batch?${params.toString()}`, {

pages/api/mongodb/getVersionsByID.js

@@ -10,7 +10,7 @@ import compareVersions from "../compareVersions";
  * @throws {Error} - Throws an error if the fetch request fails.
  */
 async function getVersionsByID(url, id) {
-    const res = await fetch(`${url}/find-resources-in-batch?id=${id}`, {
+    const res = await fetch(`${url}/find-resources-in-batch?id=${id}&resource_version=None`, {
         method: 'GET',
         headers: {
             'Content-Type': 'application/json',