Merge pull request #47 from oslabs-beta/testing

danst3in · web-flow · commit 974d9a6a1e66 · 2020-02-10T11:24:58.000-08:00
Testing for gRPC updated with some new tests. Added multiple protofile support for saving current protofile with each collection or history set
diff --git a/__tests__/businessReducer.js b/__tests__/businessReducer.js
@@ -346,6 +346,28 @@ describe('Business reducer', () => {
         graphQL: true
       }
     }
+    const requestStreamsAction = {
+      type: 'SET_NEW_REQUEST_STREAMS',
+      payload: {
+        
+        streamsArr: [],
+        count: 0,
+        streamContent: [],
+        selectedPackage: 'helloworld',
+        selectedRequest: 'helloRequest',
+        selectedService: 'hello',
+        selectedStreamingType: null,
+        initialQuery: null,
+        queryArr: null,
+        protoPath: null,
+        services: null,
+        
+      },
+    }
+    it('sets the newRequestStreams on SET_NEW_REQUEST_STREAMS', () => {
+      const { newRequestStreams } = reducer(state, requestStreamsAction);
+      expect(newRequestStreams).toEqual(requestStreamsAction.payload);
+    })
     it('sets the newRequestFields on POST', () => {
       const { newRequestFields } = reducer(state, postAction);
       expect(newRequestFields).toEqual(postAction.payload);
diff --git a/__tests__/protoParserTests.js b/__tests__/protoParserTests.js
@@ -0,0 +1,88 @@
+import protoParser from '../src/client/components/composer/protos/protoParser';
+
+
+describe('testing protoParser', ()=> {
+
+        const protoFile = `syntax = 'proto3';
+        
+        package helloworld;
+        
+        // The greeting service definition.
+        service Greeter {
+          // Sends a greeting
+          rpc SayHello (HelloRequest) returns (HelloReply) {}
+          rpc SayHelloCS (stream HelloRequest) returns (HelloReply) {}
+          rpc SayHellos (HelloRequest) returns (stream HelloReply) {}
+          rpc SayHelloBidi (stream HelloRequest) returns (stream HelloReply) {}
+        }
+        
+        // The request message containing the user's name.
+        message HelloRequest {
+          string name = 1;
+        }
+        
+        // The response message containing the greetings
+        message HelloReply {
+          string message = 1;
+        }
+        
+        // The request message containing the user's name.
+        message HelloHowOldRequest {
+          int32 age = 1;
+        }
+        message HelloAge {
+          int32 age = 1;
+        }`
+        describe('parser parses protos correctly', ()=> {
+            it('should get packageName', () => {
+                const parsedProto = protoParser(protoFile)
+                .then(data => {
+                    // console.log(d)
+                expect(data.packageName).toEqual('helloworld')
+                })
+                
+            })
+            it('should get serviceArray', () => {
+                const testArr = [{
+                    messages: [{}, {}, {}, {}], 
+                    name: 'Greeter',
+                    packageName: 'helloworld',
+                    rpcs: [{}, {}, {}, {}],
+        
+                }]
+                const parsedProto = protoParser(protoFile)
+                .then(data => {
+                    // console.log(d)
+                    expect(data.serviceArr[0].messages).toHaveLength(4);
+                    expect(data.serviceArr[0].rpcs).toHaveLength(4);
+                    expect(data.serviceArr[0].name).toEqual('Greeter');
+                    expect(data.serviceArr[0].packageName).toEqual('helloworld');
+                })
+               
+            })
+
+            it('should fill message content', () => {
+                const testArr = [{
+                    messages: [
+                        {name: "HelloRequest", def: {name: {type: "TYPE_STRING", nested: false, dependent: ''}}},
+                        {name: "HelloRequest", def: {name: {type: "TYPE_STRING", nested: false, dependent: ''}}},
+                        {name: "HelloRequest", def: {name: {type: "TYPE_STRING", nested: false, dependent: ''}}}, 
+                        {name: "HelloRequest", def: {name: {type: "TYPE_STRING", nested: false, dependent: ''}}}
+                ], 
+                    name: 'Greeter',
+                    packageName: 'helloworld',
+                    rpcs: [{}, {}, {}, {}],
+        
+                }]
+                const parsedProto = protoParser(protoFile)
+                .then(data => {
+                    expect(data.serviceArr[0].messages[0]).toEqual(testArr[0].messages[0]);
+                    expect(data.serviceArr[0].messages[0].def.name.type).toEqual("TYPE_STRING");
+                })
+               
+            })
+        
+        
+        })
+})
+
diff --git a/__tests__/responseTests.js b/__tests__/responseTests.js
@@ -26,6 +26,7 @@ describe('ResponseContainer', () => {
     wrapper.setState({ openTab: 'Response Headers' });
     expect(wrapper.find('ResponseHeadersDisplay')).toBeTruthy();
   });
+ 
 
   it('should render Response Cookies when selected', () => {
     const wrapper = shallow(<ResponseContainer {...props} />);
@@ -47,15 +48,35 @@ describe('ResponseContainer', () => {
     const wrapper = shallow(<ResponseContainer {...props} />);
     expect(wrapper.find('ResponseEventsDisplay')).toBeTruthy();
   });
+
+  props = {
+    content: {
+      gRPC: true,
+      request: {
+        method: null
+      },
+    }
+  }
+  it('gRPC req should render Response Metadata when selected', () => {
+    const wrapper = shallow(<ResponseContainer {...props} />);
+    wrapper.setState({ openTab: 'Response Metadata' });
+    expect(wrapper.find('ResponseHeadersDisplay')).toBeTruthy();
+  });
+  
 });
 
 describe('ResponseTabs', () => {
   it('should render three tabs', () => {
-    const wrapper = shallow(<ResponseTabs />);
+    const wrapper = shallow(<ResponseTabs content={'not grpc'}/>);
     expect(wrapper.find('Tab')).toHaveLength(3);
   });
+  it('grpc should render two tabs', () => {
+    const wrapper = shallow(<ResponseTabs content={{gRPC: true}}/>);
+    expect(wrapper.find('Tab')).toHaveLength(2);
+  });
 });
 
+
 describe('ResponseEventsDisplay', () => {
   it('if SSE, should render event rows', () => {
     const props = {
@@ -67,16 +88,7 @@ describe('ResponseEventsDisplay', () => {
     const wrapper = shallow(<ResponseEventsDisplay {...props} />);
     expect(wrapper.find('SSERow')).toHaveLength(2);
   });
-  // it('if gRPC, should render all events', () => {
-  //   const props = {
-  //     response: {
-  //       headers: { 'content-type': 'text/event-stream' },
-  //       events: ['event 1', 'event 2'],
-  //     }
-  //   };
-  //   const wrapper = shallow(<ResponseEventsDisplay {...props} />);
-  //   expect(wrapper.find('JSONPretty').props.data).toHaveLength(2);
-  // });
+
   it('if not SSE, should render single event', () => {
     const props = {
       response: {
diff --git a/src/client/components/composer/protos/protoParser.js b/src/client/components/composer/protos/protoParser.js
@@ -1,7 +1,8 @@
 const fs =  require('fs');
 const grpc = require('grpc');
 const protoLoader = require('@grpc/proto-loader');
-const path = require('path')
+const path = require('path');
+const uuid = require('uuid');
 
 //temp for testing >>>>
 // let tempData = fs.readFileSync(path.join(process.cwd(), 'grpc_mockData/protos/route_guide.proto'), 'utf-8')
@@ -16,16 +17,26 @@ async function protoParserFunc(protoBodyData) {
   let protoStorage = {};
   //store the original .proto content in the storage before parsing
   protoStorage.protoMaster = protoBodyData;
-
+  //make unique protoID for file we are saving
+  let protoID = Math.floor(Math.random() * 1000);
+  //if file path for that ID already exists, increment the ID
+  try {
+    while (fs.existsSync('src/client/components/composer/protos/' + protoID + '.proto')) {
+      //file exists
+      protoID += 1;
+    }
+  } catch(err) {
+    console.error(err)
+  }
   // write to saveProto file for interaction with the server
   // const dirName = remote.app.getAppPath(); // uncomment when done testing above
-  fs.writeFileSync(path.join(process.cwd(), 'src/client/components/composer/protos/saveProto.proto'), protoBodyData, 'utf-8')
+  fs.writeFileSync(path.join(process.cwd(), 'src/client/components/composer/protos/' + protoID + '.proto'), protoBodyData, 'utf-8')
     console.log('Proto file has been saved')
   // });
 
   // define the modular client for testing
   // declare path variable of imported proto file
-  const PROTO_PATH = path.join(process.cwd(), 'src/client/components/composer/protos/saveProto.proto');
+  const PROTO_PATH = path.join(process.cwd(), 'src/client/components/composer/protos/' + protoID + '.proto');
 
   // create gRPC package options
   const protoOptionsObj = {
diff --git a/src/client/components/composer/protos/saveProto.proto b/src/client/components/composer/protos/saveProto.proto
@@ -1,3 +1,4 @@
+
 // Copyright 2015 gRPC authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -109,3 +110,4 @@ message RouteSummary {
   // The duration of the traversal in seconds.
   int32 elapsed_time = 4;
 }
+
diff --git a/src/client/components/display/ResponseEventsDisplay.jsx b/src/client/components/display/ResponseEventsDisplay.jsx
@@ -6,6 +6,7 @@ import createDOMPurify from 'dompurify';
 const ResponseEventsDisplay = ({ response }) => {
   const { events, headers } = response;
   const displayContents = [];
+  console.log('what is events' , events)
 
   // If it's an SSE, render event rows
   if (headers && headers['content-type'] && headers['content-type'].includes('text/event-stream')) {
@@ -19,7 +20,7 @@ const ResponseEventsDisplay = ({ response }) => {
       <div className="okay" dangerouslySetInnerHTML={{__html: createDOMPurify.sanitize(events[0])}} />
     )
   }
-  else if (events.length > 1) {
+  else if (events && events.length > 1) {
     if (events) {
       displayContents.push(
         <div className="json-response" key="jsonresponsediv">
@@ -36,6 +37,7 @@ const ResponseEventsDisplay = ({ response }) => {
     }
     
   }
+
   // Otherwise, render a single display
   else {
     if (events) {
diff --git a/src/client/controllers/grpcController.js b/src/client/controllers/grpcController.js
@@ -19,6 +19,7 @@ let grpcController = {};
 
 grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
     //check for connection, if not open one
+    console.log(reqResObj)
   if (false) {
       //use existing connection
   }
@@ -31,6 +32,12 @@ grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
     let packageName = reqResObj.packageName;
     let url = reqResObj.url;
     let queryArr = reqResObj.queryArr;
+    if (reqResObj.response.events === null) {
+      reqResObj.response.events = [];
+    }
+    if (reqResObj.response.headers === null) {
+      reqResObj.response.headers = {};
+    }
     
     // go through services object, find service where name matches our passed
     // in service, then grab the rpc list of that service, also save that service
@@ -186,6 +193,7 @@ grpcController.openGrpcConnection = (reqResObj, connectionArray) => {
         reqResObj.connection = 'open';
         reqResObj.connectionType = 'plain';
         reqResObj.timeSent = Date.now();
+        console.log('rpc', rpc, 'reqresquery', reqResObj.queryArr[0])
         const call = client[rpc](reqResObj.queryArr[0], meta);
         call.on("data", resp => {
           // console.log('server streaming message:', data);

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+`
`1`	`2`	`// Copyright 2015 gRPC authors.`
`2`	`3`	`//`
`3`	`4`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`@@ -109,3 +110,4 @@ message RouteSummary {`
`109`	`110`	`// The duration of the traversal in seconds.`
`110`	`111`	`int32 elapsed_time = 4;`
`111`	`112`	`}`
	`113`	`+`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import createDOMPurify from 'dompurify';`
`6`	`6`	`const ResponseEventsDisplay = ({ response }) => {`
`7`	`7`	`const { events, headers } = response;`
`8`	`8`	`const displayContents = [];`
	`9`	`+ console.log('what is events' , events)`
`9`	`10`
`10`	`11`	`// If it's an SSE, render event rows`
`11`	`12`	`if (headers && headers['content-type'] && headers['content-type'].includes('text/event-stream')) {`
`@@ -19,7 +20,7 @@ const ResponseEventsDisplay = ({ response }) => {`
`19`	`20`	`<div className="okay" dangerouslySetInnerHTML={{__html: createDOMPurify.sanitize(events[0])}} />`
`20`	`21`	`)`
`21`	`22`	`}`
`22`		`- else if (events.length > 1) {`
	`23`	`+ else if (events && events.length > 1) {`
`23`	`24`	`if (events) {`
`24`	`25`	`displayContents.push(`
`25`	`26`	`<div className="json-response" key="jsonresponsediv">`
`@@ -36,6 +37,7 @@ const ResponseEventsDisplay = ({ response }) => {`
`36`	`37`	`}`
`37`	`38`
`38`	`39`	`}`
	`40`	`+`
`39`	`41`	`// Otherwise, render a single display`
`40`	`42`	`else {`
`41`	`43`	`if (events) {`