testing suite revision

Author: esclarsky

src/client/components-v2/main/response/EventsContainer.jsx

@@ -4,8 +4,9 @@ import CodeMirror from '@uiw/react-codemirror';
 // import { UnControlled as CodeMirror } from 'react-codemirror2';
 import EmptyState from '../../../components/display/EmptyState';
 import EventPreview from '../../../components/display/EventPreview';
-import { json } from '@codemirror/lang-json';
 import { EditorView } from "@codemirror/view"
+import { javascript } from '@codemirror/lang-javascript';
+
 
 function EventsContainer({ currentResponse }) {
   const { request, response } = currentResponse;

src/client/components/composer/NewRequest/BodyTypeSelect.jsx

@@ -61,6 +61,7 @@ const BodyTypeSelect = (props) => {
       <div className="dropdown-trigger">
         <button
           className="button is-small is-outlined is-primary mr-3 add-header-or-cookie-button"
+          id = "body-type-select"
           aria-haspopup="true"
           aria-controls="dropdown-menu"
           onClick={() => setDropdownIsActive(!dropdownIsActive)}

src/client/components/composer/NewRequest/RawBodyTypeSelect.jsx

@@ -61,6 +61,7 @@ const RawBodyTypeSelect = (props) => {
       <div className="dropdown-trigger">
         <button
           className="button is-small is-primary is-outlined add-header-or-cookie-button"
+          id = "raw-body-type"
           aria-haspopup="true"
           aria-controls="dropdown-menu"
           onClick={() => setDropdownIsActive(!dropdownIsActive)}

test/subSuites/graphqlTest.js

@@ -55,8 +55,7 @@ module.exports = () => {
     ) => {
       try {
         // click and check GRAPHQL
-        await page.locator('#selected-network').click();
-        await page.locator('#composer >> a >> text=GRAPHQL').click();
+        await page.locator('button>> text=GRAPHQL').click();
 
         // click and select METHOD if it isn't QUERY
         if (method !== 'QUERY') {

test/subSuites/httpTest.js

@@ -44,45 +44,44 @@ module.exports = () => {
       cookies = []
     ) => {
       try {
-        // click and check REST
-        await page.locator('#selected-network').click();
-        await page.locator('#composer >> a >> text=REST').click();
+        // Make sure HTTP2 method is selected
+        await page.locator('button>> text=HTTP2').click();
 
         // click and select METHOD if it isn't GET
         if (method !== 'GET') {
-          await page.locator('#composer >> button.is-rest').click();
-          await page.locator(`#composer >> a >> text=${method}`).click();
+          await page.locator('button#rest-method').click();
+          await page.locator(`div[id^="composer"] >> a >> text=${method}`).click();
         }
 
         // type in url
-        await page.locator('.input-is-medium').fill(url);
+        await page.locator('#url-input').fill(url);
 
         // set headers
         headers.forEach(async ({ key, value }, index) => {
           await page.locator(`#header-row${index} >> [placeholder="Key"]`).fill(key);
           await page.locator(`#header-row${index} >> [placeholder="Value"]`).fill(value);
-          await page.locator('button:near(:text("Headers"), 5)').click();
+          await page.locator('#add-header').click();
         });
 
         // set cookies
         cookies.forEach(async ({ key, value }, index) => {
           await page.locator(`#cookie-row${index} >> [placeholder="Key"]`).fill(key);
           await page.locator(`#cookie-row${index} >> [placeholder="Value"]`).fill(value);
-          await page.locator('button:near(:text("Cookies"), 5)').click();
+          await page.locator('#add-cookie').click();
         });
 
         // Add BODY as JSON if it isn't GET
         if (method !== 'GET') {
           // select body type JSON
-          if (await page.locator('button:visible >> text=text/plain').count()===1){
-            await page.locator('button >> text=text/plain').click();
-            await page.locator('a >> text=application/json').click();
+          if (await page.locator('#body-type-select').innerText()==='raw'){
+            await page.locator('#raw-body-type').click();
+            await page.locator('.dropdown-item >> text=application/json').click();
           }
 
           // insert JSON content into body
           const codeMirror = await page.locator('#body-entry-select');
           await codeMirror.click();
-          const restBody = await codeMirror.locator('textarea');
+          const restBody = await codeMirror.locator('.cm-content');
 
           try {
             for (let i = 0; i < 100; i += 1) {
@@ -133,7 +132,6 @@ module.exports = () => {
       });
     });
 
-    /** *************** !! FOR BELOW TO WORK, YOU MUST ADD YOUR OWN MONGO URI TO A .ENV FILE WITH (MONGO_URI = "YOUR_URI") !! **************** */
     describe('httpTest Server', () => {
       before('CLEAR DB', (done) => {
         chai

test/subSuites/reqInputTests.js

@@ -93,23 +93,18 @@ module.exports = () => {
 
     it('can select a request type', async () => {
       // possibly remove the first clicks based on button vs dropdown menu
-      // await page.locator('#selected-network').click();
       await page.locator('button>> text=GRAPHQL').click();
       expect(await page.locator('div#composer-graphql').count()).to.equal(1)
 
-      // await page.locator('#selected-network').click();
       await page.locator('button>> text=HTTP2').click();
       expect(await page.locator('div#composer-http2').count()).to.equal(1)
 
-      // await page.locator('#selected-network').click();
       await page.locator('button>> text=GRPC').click();
       expect(await page.locator('div#composer-grpc').count()).to.equal(1)
 
-      // await page.locator('#selected-network').click();
       await page.locator('button>> text=WEB SOCKET').click();
       expect(await page.locator('div#composer-websocket').count()).to.equal(1)
 
-      // await page.locator('#selected-network').click();
       await page.locator('button>> text=WEBRTC').click();
       expect(await page.locator('div#composer-webrtc').count()).to.equal(1)
 
@@ -251,7 +246,7 @@ module.exports = () => {
         const input = 'Team Swell is the best!';
         const bodyInput = await page.locator('div.cm-line');
         await bodyInput.fill(input);
-        expect(await page.locator('div.CodeMirror-code >> span').innerText()).to.equal(input)
+        expect(await page.locator('div.cm-content').innerText()).to.equal(input)
       });
     });
   });

test/testSuite.js

@@ -22,14 +22,14 @@ fs.emptyDirSync(path.resolve(__dirname + '/failedTests'));
 
 
 // Testing suite 
-xdescribe('Electron UI Rendering', function () {
+describe('Electron UI Rendering', function () {
   appOpensTests();
 }).timeout(10000);
 
 describe('CRUD functionality', function () {
   reqInputTests(); 
   httpTest();
-  // graphqlTest();
+  graphqlTest();
   // websocketTest();
   // grpcTest();
   // webRTCTest();