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.

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

Ampers - Nora and Sara - VideoStoreAPI #14

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
475bd3b
created rails app in VideoStoreAPI
CheerOnMars May 7, 2018
bb9d6cb
restores readme file
npeters5 May 7, 2018
83d1c40
create movie, customer, and rental models
CheerOnMars May 7, 2018
adc82a3
adds customer, movie, and rental models with relationships and valida…
npeters5 May 7, 2018
fdeafbf
schema file
npeters5 May 7, 2018
c9ec2e6
adds foreign keys migration to rentals model
npeters5 May 7, 2018
f7c73cb
added fixtures to movie
CheerOnMars May 7, 2018
e8686cf
adds model tests for Customer. edits customer and rental yml fixtures
npeters5 May 7, 2018
a7a1af9
corrected letter case on yml files
CheerOnMars May 7, 2018
bcf0f89
update db schema
CheerOnMars May 7, 2018
686d410
minor add to Customer test
npeters5 May 7, 2018
1e5fc03
adds tests for Rental model
npeters5 May 7, 2018
9cc5fcb
Merge branch 'master' of https://github.com/CheerOnMars/VideoStoreAPI
CheerOnMars May 7, 2018
ec05c56
create movie model test
CheerOnMars May 7, 2018
7e4444d
generates customers, movies and rentals controllers and default routes
npeters5 May 7, 2018
fb2a7bb
adds routes for movies index, show, create, and customer index
npeters5 May 8, 2018
78ac4a6
adds tests for customers#index
npeters5 May 8, 2018
2e69af4
updates customers#index test
npeters5 May 8, 2018
7dac99b
added controller tests
CheerOnMars May 8, 2018
13fba23
Merge branch 'master' of https://github.com/CheerOnMars/VideoStoreAPI
CheerOnMars May 8, 2018
7d6c989
create methods in customer controller
CheerOnMars May 8, 2018
fc5610d
adds index, show, and create methods to Movies controller
npeters5 May 8, 2018
d180a2f
adds test for movies#show. all movies controller tests passing
npeters5 May 8, 2018
066353d
correct movies show path
CheerOnMars May 8, 2018
36fc858
edits movies#create
npeters5 May 8, 2018
92b4e3b
merge conflict resolved
npeters5 May 8, 2018
7ef9181
minor change to json ouput for movies#create
npeters5 May 8, 2018
9f0af19
update routes to include rentals
CheerOnMars May 8, 2018
056182c
minor typo in movies controller
npeters5 May 8, 2018
de880e3
adds more assertions to movies#create tests
npeters5 May 8, 2018
f8f2842
adds rentals controller tests for checkin method
npeters5 May 8, 2018
b89e45a
updates rental fixture data;
npeters5 May 8, 2018
3511b51
add checkin tests for the rentals controller
CheerOnMars May 8, 2018
2a882cd
added checkout method in controller, updated model and test as needed
CheerOnMars May 8, 2018
180aaf8
writes rental#checkin
npeters5 May 9, 2018
e53a93f
adds assertions, refactoring to rentals controller tests
npeters5 May 9, 2018
7beb266
add due dates method
CheerOnMars May 9, 2018
5b802ff
updates inventory method call in rentals controller tests
npeters5 May 9, 2018
7464ba4
creates movie#get_available_inventory
npeters5 May 9, 2018
d83c3d4
updates rentals controller tests
npeters5 May 9, 2018
163b28b
edits movie test assertion;
npeters5 May 9, 2018
2fd0b85
experimenting with strong params and setting defaults in rentals#chec…
npeters5 May 9, 2018
a82f99c
adds as_json to pass in optional response attributes for customer
npeters5 May 9, 2018
253b9d3
adds json options to movie model;
npeters5 May 9, 2018
bf14a69
adds avail inventory to movies controller test output
npeters5 May 9, 2018
fa30da5
experimenting with rental params. test throwing error
npeters5 May 9, 2018
5bf9a9f
fixes assertion in movie test
npeters5 May 9, 2018
220ef9c
adjusts rentals#checkout
npeters5 May 9, 2018
5dd1b6d
idk
npeters5 May 9, 2018
10b82d2
fixes test
npeters5 May 9, 2018
0839776
update checkin method to take in the movie_id and customer_id
CheerOnMars May 10, 2018
b94308e
tweaks rentals#checkin to return status ok upon successful request
npeters5 May 10, 2018
428763b
add query parameters
CheerOnMars May 10, 2018
c35368c
adds to gemfile.lock
npeters5 May 11, 2018
2407230
adds sorting params to movies#index
npeters5 May 11, 2018
926d116
adds rentals#overdue
npeters5 May 11, 2018
5d4c36b
sets default pagination in app controller
npeters5 May 11, 2018
381f856
no changes
npeters5 May 11, 2018
f3dcec4
adds rental model methods for getting checkedout and overdue rentals
npeters5 May 11, 2018
cfa7f70
adds route for overdue rentals
npeters5 May 11, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
updates customers#index test
npeters5 committed May 8, 2018

Verified

This commit was signed with the committer’s verified signature.
frapell Franco Pellegrini
commit 2e69af49413d5d2e16ea5a8b86afef20665cd49f
2 changes: 1 addition & 1 deletion test/controllers/customers_controller_test.rb
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@
end

it "returns customers with exactly the required fields" do
keys = %w(name registered_at address city state postal_code phone)
keys = %w(id name registered_at postal_code phone movies_checked_out_count)
get customers_url
body = JSON.parse(response.body)
body.each do |customer|