Dianne and Mary BFFs - #13

Open

morrime wants to merge 23 commits into

Ada-C6:masterfrom

Commits on Nov 8, 2016

setup
morrime
committed
49d6b4f
added secrets for dianne
dlaguerta
committed
19ff88e
added set up for methods in our Shipping model
dlaguerta
committed
cb79e99
writing methods for shipping model, trying to get working model test
morrime
committed
4131597

Commits on Nov 9, 2016

test and method for destination are working, probably
morrime
committed
b6d0edc
added vcr setup to test_helper file
dlaguerta
committed
a2734b5
deleted unnecessary stuff
dlaguerta
committed
af44fe4
working on tests for the ups carrier
dlaguerta
committed
aac860f
test for create packages, looking good
morrime
committed
504389b
working on test
dlaguerta
committed
545d0db
added tests for usps method and fixed actual method, realized .env file is useless, must hard code login info, got simplecov up and running in test_helper file
morrime
committed
2424163
fixed merge conflicts in my branch
dlaguerta
committed
caa2a42
shipping controller action create is working. YAY. test is also passing. logger has been implemented.
morrime
committed
832146d

Commits on Nov 10, 2016

added method and tests for ups method
dlaguerta
committed
ea254e2
cleaned up some commented out stuff in controller
morrime
committed
bdba6d3
Merge branch 'dkl/vcr_ups'
dlaguerta
committed
aeeaf89
make minor changes to the tests
dlaguerta
committed
157fb9b
making changes in the model, planning to make class methods into instance methods
dlaguerta
committed
5eb6ec6
new shipping option method that we're tweaking
dlaguerta
committed
3fd72d4
having trouble making things work
dlaguerta
committed
6677d56
shown that things work when you throw everything into the controller, which is soooooo wrong
dlaguerta
committed
6b85db8
working on fixing all our broken tests now, but our create method works as best as it can
dlaguerta
committed
8454789
fixed our tests and added a few more assertions
dlaguerta
committed
7e22e69