Skip to content

Commit 8610cac

Browse files
samhaarsamhaar
committed
Merge branch 'master' of https://github.com/oslabs-beta/Swell 
2 parents 6c487f2 + 513a681 commit 8610cac

File tree

8 files changed

+155
-150
lines changed

8 files changed

+155
-150
lines changed

‎__tests__/businessReducer.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ describe("Business reducer", () => {
5757
isSSE: false,
5858
},
5959
introspectionData: { schemaSDL: null, clientSchema: null },
60-
dataPoints: [],
60+
dataPoints: {},
6161
currentResponse: {
6262
request: {
63-
network: ''
64-
}
63+
network: "",
64+
},
6565
},
6666
};
6767
});

‎src/client/components/composer/RestContainer.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,8 @@ export default function RestContainer({
203203
handleSSEPayload(e);
204204
}}
205205
checked={isSSE}
206-
></input>
207-
<label htmlFor="SSEswitch">
208-
</label>
206+
/>
207+
<label htmlFor="SSEswitch" />
209208
</div>
210209
</div>
211210
<div className="is-3rem-footer is-clickable is-margin-top-auto">

‎src/client/components/containers/SingleReqResContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ const SingleReqResContainer = (props) => {
138138
dispatch(actions.setNewRequestHeaders(requestHeadersObj));
139139
dispatch(actions.setNewRequestCookies(requestCookiesObj));
140140
dispatch(actions.setNewRequestBody(requestBodyObj));
141+
dispatch(actions.setNewRequestSSE(content.request.isSSE));
141142

142-
// for gRPC ===> NEED TO FILL OUT
143143
if (content && content.gRPC) {
144144
const streamsDeepCopy = JSON.parse(JSON.stringify(content.streamsArr));
145145
const contentsDeepCopy = JSON.parse(

‎src/client/components/display/History.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { useDispatch } from 'react-redux';
55
import * as actions from '../../actions/actions';
66
import historyController from '../../controllers/historyController';
77

8-
const History = ({ newRequestFields, content, content: { request : { method,
8+
const History = ({ newRequestFields, content, content: { request : { method, isSSE,
99
headers, cookies, bodyType, body, bodyVariables, rawType, JSONFormatted, network,
1010
restUrl, wsUrl, gqlUrl, grpcUrl }, protocol, url, graphQL, gRPC, streamsArr,
1111
streamContent, queryArr, packageName, rpc, service, initialQuery, protoPath,
@@ -14,12 +14,14 @@ const History = ({ newRequestFields, content, content: { request : { method,
1414

1515
const dispatch = useDispatch();
1616
const setSidebarTab = (tabName) => dispatch(actions.setSidebarActiveTab(tabName));
17+
const setNewRequestSSE = (bool) => dispatch(actions.setNewRequestSSE(bool));
1718

1819
const addHistoryToNewRequest = () => {
1920
let requestFieldObj = {};
2021
if (network === 'rest') {
2122
requestFieldObj = {
2223
...newRequestFields,
24+
isSSE: isSSE || false,
2325
method: method || 'GET',
2426
protocol: protocol || 'http://',
2527
url,
@@ -105,6 +107,7 @@ const History = ({ newRequestFields, content, content: { request : { method,
105107
setNewRequestHeaders(requestHeadersObj);
106108
setNewRequestCookies(requestCookiesObj);
107109
setNewRequestBody(requestBodyObj);
110+
setNewRequestSSE(isSSE);
108111
// for gRPC
109112
if (content && gRPC) {
110113
const streamsDeepCopy = JSON.parse(JSON.stringify(streamsArr));

‎test/pageObjects/ComposerObj.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class ComposerObj {
5050
return app.client.$('button=Add New Request');
5151
};
5252

53-
clearRestBodyAndWriteKeys = async (keys, clear = true) => {
53+
async clearRestBodyAndWriteKeys(keys, clear = true){
5454
const backspace = [];
5555
for (let i = 0; i < 30; i += 1) {
5656
backspace.push('Backspace')
@@ -64,7 +64,7 @@ class ComposerObj {
6464
}
6565
}
6666

67-
clearGQLBodyAndWriteKeys = async (keys, clear = true) => {
67+
async clearGQLBodyAndWriteKeys(keys, clear = true){
6868
const backspace = [];
6969
for (let i = 0; i < 30; i += 1) {
7070
backspace.push('Backspace')
@@ -78,7 +78,7 @@ class ComposerObj {
7878
}
7979
}
8080

81-
clickGQLVariablesAndWriteKeys = async (keys) => {
81+
async clickGQLVariablesAndWriteKeys(keys){
8282
try {
8383
await this.gqlVariableCode.keys(keys);
8484
} catch(err) {

‎test/subSuites/grpcTest.js

Lines changed: 119 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,127 @@
1-
const chai = require("chai");
2-
const fs = require("fs");
3-
const path = require("path");
4-
const sideBar = require("../pageObjects/Sidebar.js");
5-
const reqRes = require("../pageObjects/ReqRes.js");
6-
const grpcServer = require('../grpcServer.js')
1+
// OLD GRPC TESTS BELOW. CURRENT GRPC TESTS NOT FUNCTIONING
72

8-
const expect = chai.expect;
93

10-
module.exports = () => {
11-
describe("gRPC requests", () => {
4+
// const chai = require("chai");
5+
// const fs = require("fs");
6+
// const path = require("path");
7+
// const sideBar = require("../pageObjects/Sidebar.js");
8+
// const reqRes = require("../pageObjects/ReqRes.js");
9+
// const grpcServer = require('../grpcServer.js')
1210

13-
beforeEach(async () => {
14-
try {
15-
await reqRes.removeBtn.click();
16-
} catch(err) {
17-
console.error(err)
18-
}
19-
});
11+
// const expect = chai.expect;
2012

21-
let body = "";
13+
// module.exports = () => {
14+
// describe("gRPC requests", () => {
2215

23-
before((done) => {
24-
fs.readFile(path.join(__dirname, "../hw2.proto"), "utf8", (err, data) => {
25-
if (err) console.log(err);
26-
body = data;
27-
done();
28-
});
29-
});
16+
// beforeEach(async () => {
17+
// try {
18+
// await reqRes.removeBtn.click();
19+
// } catch(err) {
20+
// console.error(err)
21+
// }
22+
// });
3023

31-
before(() => {
32-
try {
33-
grpcServer('open')
34-
} catch(err) {
35-
console.error(err)
36-
}
37-
});
24+
// let body = "";
3825

39-
after(() => {
40-
try {
41-
grpcServer('close');
42-
} catch(err) {
43-
console.error(err)
44-
}
45-
});
26+
// before((done) => {
27+
// fs.readFile(path.join(__dirname, "../hw2.proto"), "utf8", (err, data) => {
28+
// if (err) console.log(err);
29+
// body = data;
30+
// done();
31+
// });
32+
// });
4633

47-
const sideBarSetup = async () => {
48-
try {
49-
await sideBar.gRPC.click();
50-
await sideBar.url.setValue("0.0.0.0:50051");
51-
await sideBar.grpcBody.addValue(body);
52-
await sideBar.saveChanges.click();
53-
} catch(err) {
54-
console.error(err)
55-
}
56-
};
57-
const requestSetup = async (index) => {
58-
try {
59-
await sideBar.selectRequest.selectByIndex(index);
60-
await sideBar.addRequestBtn.click();
61-
await reqRes.sendBtn.click();
62-
const res = await reqRes.jsonPretty.getText();
63-
return res;
64-
} catch(err) {
65-
console.error(err)
66-
}
67-
};
68-
it("it should work on a unary request", async () => {
69-
try {
70-
await sideBarSetup();
71-
await sideBar.selectService.selectByIndex(1);
72-
const jsonPretty = await requestSetup(1);
73-
await new Promise((resolve) =>
74-
setTimeout(async () => {
75-
expect(jsonPretty).to.include(`"message": "Hello string"`);
76-
resolve();
77-
}, 800)
78-
);
79-
} catch(err) {
80-
console.error(err)
81-
}
82-
});
83-
it("it should work on a nested unary request", async () => {
84-
try {
85-
const jsonPretty = await requestSetup(2);
86-
expect(jsonPretty).to.include(
87-
`{\n "serverMessage": [\n {\n "message": "Hello! string"\n },\n {\n "message": "Hello! string"\n }\n ]\n}`
88-
);
89-
} catch(err) {
90-
console.error(err)
91-
}
92-
});
93-
it("it should work on a server stream", async () => {
94-
try {
95-
const jsonPretty = await requestSetup(3);
96-
expect(jsonPretty).to.include(
97-
`{\n "response": [\n {\n "message": "You"\n },\n {\n "message": "Are"\n`
98-
);
99-
} catch(err) {
100-
console.error(err)
101-
}
102-
});
103-
it("it should work on a client stream", async () => {
104-
try {
105-
const jsonPretty = await requestSetup(4);
106-
expect(jsonPretty).to.include(
107-
`{\n "message": "received 1 messages"\n}`
108-
);
109-
} catch(err) {
110-
console.error(err)
111-
}
112-
});
113-
it("it should work on a bidirectional stream", async () => {
114-
try {
115-
const jsonPretty = await requestSetup(5);
116-
expect(jsonPretty).to.include(
117-
`{\n "message": "bidi stream: string"\n}`
118-
);
119-
} catch(err) {
120-
console.error(err)
121-
}
122-
});
123-
});
124-
};
34+
// before(() => {
35+
// try {
36+
// grpcServer('open')
37+
// } catch(err) {
38+
// console.error(err)
39+
// }
40+
// });
41+
42+
// after(() => {
43+
// try {
44+
// grpcServer('close');
45+
// } catch(err) {
46+
// console.error(err)
47+
// }
48+
// });
49+
50+
// const sideBarSetup = async () => {
51+
// try {
52+
// await sideBar.gRPC.click();
53+
// await sideBar.url.setValue("0.0.0.0:50051");
54+
// await sideBar.grpcBody.addValue(body);
55+
// await sideBar.saveChanges.click();
56+
// } catch(err) {
57+
// console.error(err)
58+
// }
59+
// };
60+
// const requestSetup = async (index) => {
61+
// try {
62+
// await sideBar.selectRequest.selectByIndex(index);
63+
// await sideBar.addRequestBtn.click();
64+
// await reqRes.sendBtn.click();
65+
// const res = await reqRes.jsonPretty.getText();
66+
// return res;
67+
// } catch(err) {
68+
// console.error(err)
69+
// }
70+
// };
71+
// it("it should work on a unary request", async () => {
72+
// try {
73+
// await sideBarSetup();
74+
// await sideBar.selectService.selectByIndex(1);
75+
// const jsonPretty = await requestSetup(1);
76+
// await new Promise((resolve) =>
77+
// setTimeout(async () => {
78+
// expect(jsonPretty).to.include(`"message": "Hello string"`);
79+
// resolve();
80+
// }, 800)
81+
// );
82+
// } catch(err) {
83+
// console.error(err)
84+
// }
85+
// });
86+
// it("it should work on a nested unary request", async () => {
87+
// try {
88+
// const jsonPretty = await requestSetup(2);
89+
// expect(jsonPretty).to.include(
90+
// `{\n "serverMessage": [\n {\n "message": "Hello! string"\n },\n {\n "message": "Hello! string"\n }\n ]\n}`
91+
// );
92+
// } catch(err) {
93+
// console.error(err)
94+
// }
95+
// });
96+
// it("it should work on a server stream", async () => {
97+
// try {
98+
// const jsonPretty = await requestSetup(3);
99+
// expect(jsonPretty).to.include(
100+
// `{\n "response": [\n {\n "message": "You"\n },\n {\n "message": "Are"\n`
101+
// );
102+
// } catch(err) {
103+
// console.error(err)
104+
// }
105+
// });
106+
// it("it should work on a client stream", async () => {
107+
// try {
108+
// const jsonPretty = await requestSetup(4);
109+
// expect(jsonPretty).to.include(
110+
// `{\n "message": "received 1 messages"\n}`
111+
// );
112+
// } catch(err) {
113+
// console.error(err)
114+
// }
115+
// });
116+
// it("it should work on a bidirectional stream", async () => {
117+
// try {
118+
// const jsonPretty = await requestSetup(5);
119+
// expect(jsonPretty).to.include(
120+
// `{\n "message": "bidi stream: string"\n}`
121+
// );
122+
// } catch(err) {
123+
// console.error(err)
124+
// }
125+
// });
126+
// });
127+
// };

0 commit comments

Comments
 (0)