Skip to content

Commit 6f7cbbe

Browse files
gspletzergspletzer
committed
master cleanup merge update
2 parents f279c69 + 5a2a8ff commit 6f7cbbe

25 files changed

+233
-1068
lines changed

‎.eslintrc.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ module.exports = {
9191
"import/extensions": 0,
9292
"import/no-extraneous-dependencies": 0,
9393
"import/no-unresolved": 0,
94+
"import/prefer-default-export": 0,
9495
"max-len": 0,
9596
"no-alert": 0,
9697
"no-console": 0,

‎__mocks__/electronMock.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export const ipcRenderer = {
2-
on: jest.fn()
3-
};
1+
export const ipcRenderer = {
2+
on: jest.fn(),
3+
};

‎__mocks__/fileMock.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
// see jest.config
12
module.exports = "test-file-stub";

‎__mocks__/styleMocks.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
// module.exports = 'test-file-stub';
1+
// see jest.config
22

33
module.exports = {};

‎__tests__/composerTests.js‎

Lines changed: 22 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,22 @@
1-
// import electron from 'electron'
2-
// const session = require('electron').remote.session;
3-
import reducer from '../src/client/reducers/business';
4-
import React from 'react';
5-
import { configure, shallow } from 'enzyme';
6-
import Adapter from 'enzyme-adapter-react-16';
7-
import toJson, { mountToJson } from 'enzyme-to-json';
8-
import {remote} from "electron";
9-
import { JestEnvironment } from '@jest/environment';
10-
// Enzyme is a wrapper around React test utilities which makes it easier to
11-
// shallow render and traverse the shallow rendered tree.
12-
// import * as actions from '../src/client/actions/actions.js';
13-
// import httpController from '../src/client/controllers/httpController.js'
14-
// import historyController from '../src/client/controllers/historyController.js'
15-
// import reqResController from '../src/client/controllers/reqResController.js'
16-
// import ComposerNewRequest from "../src/client/components/composer/NewRequest/ComposerNewRequest.jsx"; //doesn't like png
1+
import React from "react";
2+
import { configure, shallow } from "enzyme";
3+
import Adapter from "enzyme-adapter-react-16";
174
import ProtocolSelect from "../src/client/components/composer/NewRequest/ProtocolSelect.jsx";
18-
import FieldEntryForm from "../src/client/components/composer/NewRequest/FieldEntryForm.jsx";
19-
// import HeaderEntryForm from '../src/client/components/composer/NewRequest/HeaderEntryForm.jsx'; //doesn't like png
20-
import Header from '../src/client/components/composer/NewRequest/Header.jsx';
21-
// import CookieEntryForm from '../src/client/components/composer/NewRequest/CookieEntryForm.jsx'; //doesn't like png
22-
// import BodyEntryForm from "../src/client/components/composer/NewRequest/BodyEntryForm.jsx";
23-
import BodyTypeSelect from "../src/client/components/composer/NewRequest/BodyTypeSelect.jsx";
24-
import WWWForm from '../src/client/components/composer/NewRequest/WWWForm.jsx';
25-
import WWWField from '../src/client/components/composer/NewRequest/WWWField.jsx';
26-
import JSONTextArea from '../src/client/components/composer/NewRequest/JSONTextArea.jsx';
27-
// import GraphQLBodyEntryForm from "../src/client/components/composer/NewRequest/GraphQLBodyEntryForm.jsx"; //doesn't like png
28-
// import GraphQLVariableEntryForm from "../src/client/components/composer/NewRequest/GraphQLVariableEntryForm.jsx"; //doesn't like png
29-
// import HistoryContainer from '../src/client/components/containers/HistoryContainer.jsx'; //doesn't like electron sessions
30-
// import HistoryDate from '../src/client/components/display/HistoryDate.jsx'; //doesn't like electron sessions
31-
// import History from '../src/client/components/display/History.jsx'; //doesn't like electron sessions or png
32-
import Graph from '../src/client/components/display/Graph.jsx';
33-
// import NavBarContainer from '../src/client/components/containers/NavBarContainer.jsx'; //doesn't like electron sessions
34-
// import ReqResContainer from '../src/client/components/containers/ReqResContainer.jsx'; //doesn't like electron sessions
35-
// import ReqRes from '../src/client/components/display/ReqRes.jsx'; //doesn't like electron sessions or png
36-
// import OpenBtn from '../src/client/components/display/OpenBtn.jsx'; //doesn't like electron sessions or png
37-
// import CloseBtn from '../src/client/components/display/CloseBtn.jsx'; //doesn't like electron sessions or png
38-
import RequestTabs from '../src/client/components/display/RequestTabs.jsx';
39-
import Tab from '../src/client/components/display/Tab.jsx';
40-
// import WebSocketWindow from '../src/client/components/display/WebSocketWindow.jsx'; //doesn't like electron sessions
41-
import WebSocketMessage from '../src/client/components/display/WebSocketMessage.jsx';
42-
// import ResponseContainer from '../src/client/components/containers/ResponseContainer.jsx'; //doesn't like electron sessions
43-
import ResponseTabs from '../src/client/components/display/ResponseTabs.jsx';
44-
import ResponseEventsDisplay from '../src/client/components/display/ResponseEventsDisplay.jsx';
45-
import SSERow from '../src/client/components/display/SSERow.jsx';
46-
import ResponseHeadersDisplay from '../src/client/components/display/ResponseHeadersDisplay.jsx';
47-
// import ResponseCookiesDisplay from '../src/client/components/display/ResponseCookiesDisplay.jsx'; //doesn't like electron sessions
48-
import CookieTable from '../src/client/components/display/CookieTable.jsx';
49-
import CookieTableRow from '../src/client/components/display/CookieTableRow.jsx';
50-
import CookieTableCell from '../src/client/components/display/CookieTableCell.jsx';
51-
// import ResponseSubscriptionDisplay from '../src/client/components/display/ResponseSubscriptionDisplay.jsx'; //doesn't like electron sessions
525

53-
54-
// Newer Enzyme versions require an adapter to a particular version of React
556
configure({ adapter: new Adapter() });
567

57-
describe('GraphQL Composer', () => {
8+
describe("GraphQL Composer", () => {
589
let state;
5910
state = {
60-
currentTab: 'First Tab',
11+
currentTab: "First Tab",
6112
reqResArray: [],
6213
history: [],
6314
warningMessage: "",
6415
newRequestFields: {
65-
method: 'GET',
66-
protocol: '',
67-
url: '',
68-
graphQL: false
16+
method: "GET",
17+
protocol: "",
18+
url: "",
19+
graphQL: false,
6920
},
7021
newRequestHeaders: {
7122
headersArr: [],
@@ -76,32 +27,29 @@ describe('GraphQL Composer', () => {
7627
count: 0,
7728
},
7829
newRequestBody: {
79-
bodyContent: '',
80-
bodyType: 'raw',
81-
rawType: 'Text (text/plain)',
30+
bodyContent: "",
31+
bodyType: "raw",
32+
rawType: "Text (text/plain)",
8233
JSONFormatted: true,
83-
bodyVariables: ''
34+
bodyVariables: "",
8435
},
8536
};
86-
87-
88-
89-
describe('Setting GQL fields, headers, and body', () => {
90-
describe('ProtocolSelect', () => {
37+
describe("Setting GQL fields, headers, and body", () => {
38+
describe("ProtocolSelect", () => {
9139
let wrapper;
9240
const props = {
93-
currentProtocol: '',
41+
currentProtocol: "",
9442
onChangeHandler: jest.fn(),
95-
graphQL: false
43+
graphQL: false,
9644
};
9745

9846
beforeAll(() => {
9947
wrapper = shallow(<ProtocolSelect {...props} />);
10048
});
10149

102-
it('Renders a <div>', () => {
103-
expect(wrapper.type()).toEqual('div');
50+
it("Renders a <div>", () => {
51+
expect(wrapper.type()).toEqual("div");
10452
});
105-
})
106-
})
107-
})
53+
});
54+
});
55+
});

‎__tests__/dbTests.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// started dexie testing set up.
2+
// I would suggest continue TDD by writing some collection tests, then
3+
// importing the actual controllers and testing directlyerly
4+
15
// const collectionsController = require("../src/client/controllers/collectionsController");
26
// const historyController = require("../src/client/controllers/historyController");
37

‎__tests__/historyUnitTest.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// using react-testing-library instead of enzyme as it seems like a better idea.
2+
// google the enzyme shallow problem
3+
// currently we can't find a way to run these tests with our current security setup (nodeIntegration false, global api instead of ipcRenderer)
4+
15
import React from "react";
26
import { createStore } from "redux";
37
import { Provider } from "react-redux";

‎__tests__/protoParserTests.js‎

Lines changed: 69 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import protoParser from '../src/client/protoParser';
1+
import protoParser from "../src/client/protoParser";
22

3-
4-
describe('testing protoParser', ()=> {
5-
6-
const protoFile = `syntax = 'proto3';
3+
describe("testing protoParser", () => {
4+
const protoFile = `syntax = 'proto3';
75
86
package helloworld;
97
@@ -32,55 +30,70 @@ describe('testing protoParser', ()=> {
3230
}
3331
message HelloAge {
3432
int32 age = 1;
35-
}`
36-
describe('parser parses protos correctly', ()=> {
37-
it('should get packageName', () => {
38-
const parsedProto = protoParser(protoFile)
39-
.then(data => {
40-
expect(data.packageName).toEqual('helloworld')
41-
})
42-
43-
})
44-
it('should get serviceArray', () => {
45-
const testArr = [{
46-
messages: [{}, {}, {}, {}],
47-
name: 'Greeter',
48-
packageName: 'helloworld',
49-
rpcs: [{}, {}, {}, {}],
50-
51-
}]
52-
const parsedProto = protoParser(protoFile)
53-
.then(data => {
54-
expect(data.serviceArr[0].messages).toHaveLength(4);
55-
expect(data.serviceArr[0].rpcs).toHaveLength(4);
56-
expect(data.serviceArr[0].name).toEqual('Greeter');
57-
expect(data.serviceArr[0].packageName).toEqual('helloworld');
58-
})
59-
60-
})
61-
62-
it('should fill message content', () => {
63-
const testArr = [{
64-
messages: [
65-
{name: "HelloRequest", def: {name: {type: "TYPE_STRING", nested: false, dependent: ''}}},
66-
{name: "HelloRequest", def: {name: {type: "TYPE_STRING", nested: false, dependent: ''}}},
67-
{name: "HelloRequest", def: {name: {type: "TYPE_STRING", nested: false, dependent: ''}}},
68-
{name: "HelloRequest", def: {name: {type: "TYPE_STRING", nested: false, dependent: ''}}}
69-
],
70-
name: 'Greeter',
71-
packageName: 'helloworld',
72-
rpcs: [{}, {}, {}, {}],
73-
74-
}]
75-
const parsedProto = protoParser(protoFile)
76-
.then(data => {
77-
expect(data.serviceArr[0].messages[0]).toEqual(testArr[0].messages[0]);
78-
expect(data.serviceArr[0].messages[0].def.name.type).toEqual("TYPE_STRING");
79-
})
80-
81-
})
82-
83-
84-
})
85-
})
33+
}`;
34+
describe("parser parses protos correctly", () => {
35+
it("should get packageName", () => {
36+
const parsedProto = protoParser(protoFile).then((data) => {
37+
expect(data.packageName).toEqual("helloworld");
38+
});
39+
});
40+
it("should get serviceArray", () => {
41+
const testArr = [
42+
{
43+
messages: [{}, {}, {}, {}],
44+
name: "Greeter",
45+
packageName: "helloworld",
46+
rpcs: [{}, {}, {}, {}],
47+
},
48+
];
49+
const parsedProto = protoParser(protoFile).then((data) => {
50+
expect(data.serviceArr[0].messages).toHaveLength(4);
51+
expect(data.serviceArr[0].rpcs).toHaveLength(4);
52+
expect(data.serviceArr[0].name).toEqual("Greeter");
53+
expect(data.serviceArr[0].packageName).toEqual("helloworld");
54+
});
55+
});
8656

57+
it("should fill message content", () => {
58+
const testArr = [
59+
{
60+
messages: [
61+
{
62+
name: "HelloRequest",
63+
def: {
64+
name: { type: "TYPE_STRING", nested: false, dependent: "" },
65+
},
66+
},
67+
{
68+
name: "HelloRequest",
69+
def: {
70+
name: { type: "TYPE_STRING", nested: false, dependent: "" },
71+
},
72+
},
73+
{
74+
name: "HelloRequest",
75+
def: {
76+
name: { type: "TYPE_STRING", nested: false, dependent: "" },
77+
},
78+
},
79+
{
80+
name: "HelloRequest",
81+
def: {
82+
name: { type: "TYPE_STRING", nested: false, dependent: "" },
83+
},
84+
},
85+
],
86+
name: "Greeter",
87+
packageName: "helloworld",
88+
rpcs: [{}, {}, {}, {}],
89+
},
90+
];
91+
const parsedProto = protoParser(protoFile).then((data) => {
92+
expect(data.serviceArr[0].messages[0]).toEqual(testArr[0].messages[0]);
93+
expect(data.serviceArr[0].messages[0].def.name.type).toEqual(
94+
"TYPE_STRING"
95+
);
96+
});
97+
});
98+
});
99+
});

0 commit comments

Comments
 (0)