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

Order to service testing #147

Merged
merged 29 commits into from
Nov 5, 2023
Merged

Order to service testing #147

merged 29 commits into from
Nov 5, 2023

Conversation

u22528492
Copy link
Collaborator

No description provided.

JMPastoll and others added 29 commits November 3, 2023 22:25
@JMPastoll
Merge branch 'unit-test-orders' of https://github.com/waveyboym/COS-2…
9e0b6be 
…14-Project into Kitchen
@JMPastoll
Chefs updated, Kitchen added, other minor fixes
e8f73e8
@JMPastoll
Merge branch 'unit-test-orders' of https://github.com/waveyboym/COS-2…
fe69714 
…14-Project into Kitchen
@u22528492
Added Functions & Variables for Order in Customer
7b38957
@u22528492
Includes and work on setOrder function
9698884
@u22528492
Completed setOrder & getOrder functions
2e0b6cb 
Still needs testing
@u22528492
Commenting this out so code compiles
917ada3
@u22528492
Edited Customer to create Order Vector
bc5cbf2 
FIxed typo in AddBBQSauce.hpp aswell
@u22528492
Set and Get Order Functions in Customer work
0b815f4
@u22528492
Implemented waiter functionality
cb97f8c 
-taking order
-getting order
@u22528492
Added waiter taking order unit test
9bdab8e
@JMPastoll
Kitchen Tests
03e234c
@u22528492
Rearranged order includes in tests for stability
cceb7da
@u22528492
Added prepTime for Meals
8b23acc 
Needs debugging
@u22528492
Merge branch 'Jaden-Order-to-Serving-Food-Integration-Testing' into K…
2319838 
…itchen
@u22528492
Revert "Merge branch 'Jaden-Order-to-Serving-Food-Integration-Testing…
365ca2b 
…' into Kitchen"

This reverts commit 2319838, reversing
changes made to 03e234c.
@u22528492
Added changes from Integration-Testing branch
64fc1be
@JMPastoll
Fixed half the error messages
b822a91
@JMPastoll
More errors gone - include guard for BBQ sauce was spelt wrong
fa5d8e2
@u22528492
It's all fixed
4cb1ca4
@u22528492
Merge branch 'Order-to-Service-Testing' of https://github.com/waveybo…
c4049df 
…ym/COS-214-Project into Order-to-Service-Testing
@JMPastoll
This branch should run now at least
4601783 
-- I'll keep looking to see why the tests have started failing now
@JMPastoll
Merge branch 'Order-to-Service-Testing' of https://github.com/waveybo…
b3efca7 
…ym/COS-214-Project into Order-to-Service-Testing
@u22528492
Delete .vscode directory
053f71f
@u22528492
Beginning Integreation testing
f07d84c
@u22528492
Merge branch 'Order-to-Service-Testing' of https://github.com/waveybo…
0ee3e90 
…ym/COS-214-Project into Order-to-Service-Testing
@u22528492
Testing complete
fa31dca
@u22528492
Uncommented Tests
ab53921
@u22528492
Merge branch 'restaurant-class-only' of https://github.com/waveyboym/…
b5a3448 
…COS-214-Project into Order-to-Service-Testing
@u22528492 u22528492 merged commit 33ee560 into restaurant-class-only Nov 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@u22528492 @JMPastoll