Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merging dev into master branch #347

Merged
merged 31 commits into from
Nov 2, 2023
Merged

merging dev into master branch #347

merged 31 commits into from
Nov 2, 2023

Conversation

k-villano
Copy link
Contributor

No description provided.

k-villano and others added 30 commits October 16, 2023 12:24
@k-villano
updated electron app and tests still working
b3cbfce
@k-villano
Merge pull request #1 from oslabs-beta/group/packages2
d2ed466 
updated electron app and tests still working
@k-villano
updated jest all tests passing except one, deleted types/jest from pa…
ca6cb00 
…ckage json
@k-villano
updated jest config jest 29 is functional protoParser test xed out
7e80c1b
@k-villano
Merge pull request #2 from oslabs-beta/group/packages2
d650d94 
Group/packages2
@bhsauro
removed jest-electron modules due to breaking change in jest update
d34d3a4
@bhsauro
moved chai, @testing-library/react, and jest-environment-jsdom to dev…
d1a6f68 
…dependencies
@bhsauro
updated chai (patch), chai-http (minor), and mocha (major) /no breaki…
7e30f1a 
…ng changes
@bhsauro
all test libraries (except for istanbul) updated
741b988
@bhsauro
Merge pull request #3 from oslabs-beta/brooke/testpkgs
e7b388b 
Brooke/testpkgs
@k-villano
working on dev tools
cbd2436
@k-villano
included react dev tools with older version that works
4118467
@k-villano
reslved merge conflits react dev tools working
4319b8e
@k-villano
Merge pull request #4 from oslabs-beta/group/packages2
372ae6e 
Group/packages2
@k-villano
update react dev tools to include rbuild folder
2b32116
@k-villano
Merge pull request #5 from oslabs-beta/katya/vm
588f2ab 
update react dev tools to include rbuild folder
@levinjn01
adding instructions for testing GRPC to docs
c96abd8
@levinjn01
Merge pull request #6 from oslabs-beta/jeff/soap
a57be1a 
adding instructions for testing GRPC to docs
@bhsauro
created new test file for graphQLControllerTests, implemented test fo…
16aec5f 
…r openGraphQLConnection function
@bhsauro
added handleError and handleResponse tests
db6554e
@bhsauro
finished cleanup of graphQL unit tests
f1ed42f
@bhsauro
Merge pull request #7 from oslabs-beta/brooke/unittests
bade5f0 
Brooke/unittests
@k-villano
added assertion testing to http2 functionality
c4e2cfc
@k-villano
Merge branch 'dev' into katya/replacevm
2b76893
@k-villano
Merge pull request #8 from oslabs-beta/katya/replacevm
f6be548 
Katya/replacevm
@AArCruz
exploritory buttons removed and github button modified
c8562e6
@k-villano
Merge pull request #9 from oslabs-beta/AArCruz/buttons
839f291 
exploratory buttons removed and github button modified
@bhsauro
wrote http collection tests
4798cb8
@bhsauro
merged in dev
d665203
@bhsauro
Merge pull request #10 from oslabs-beta/brooke/featuretests
e0357cb 
added collectionTest.js
levinjn01
levinjn01 approved these changes Nov 2, 2023
View reviewed changes
Copy link
Contributor

@levinjn01 levinjn01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent work, team!

@levinjn01 levinjn01 merged commit e677a96 into open-source-labs:master Nov 2, 2023
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AArCruz AArCruz AArCruz approved these changes

@levinjn01 levinjn01 levinjn01 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@k-villano @levinjn01 @AArCruz @bhsauro