Hannah Gray- Final Pull/Commit Messages #612
Conversation
| @@ -1,16 +1,40 @@ | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
Anytime you see <<<<< and ===== symbols, those indicate the presence of a merge conflict and technically the merge conflict is not resolved until these symbols are cleared. In its current state, this class is not stable/usable until that merge conflict is resolved. Notice that this top section is the initial starter code for this class.
| attr_reader :facilities | ||
|
|
||
| # Initializes an empty array to store Facility objects. | ||
| >>>>>>> feature/vehicle-class |
There was a problem hiding this comment.
Here are your additions to the class. You can remove the duplication so that it's just one single class with the necessary attr_readers, initialize and methods
There was a problem hiding this comment.
There is a really helpful VSCode tool that can allow you to visualize what a merged class looks like. If you look at this branch in VSCode, you should see an option that says "View Code in Merge Editor" or something like that, and that view will be very helpful for solving these conflicts!
| @@ -1,14 +1,51 @@ | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
Same goes for this class --> you're still in the midst of a merge conflict here and will need to merge the code accordingly and then remove the merge conflict symbols
| def wa_ev_registrations | ||
| @wa_ev_registrations ||= load_data('https://data.wa.gov/resource/rpr4-cgyd.json') | ||
| load_data('https://data.wa.gov/resource/rpr4-cgyd.json') |
There was a problem hiding this comment.
I wouldn't expect you to need to update these instance variables. Did you have an issue with reading them from another class?
| # @param data [Array<Hash>] An array of facility details from the API. | ||
| # @return [Array<Facility>] An array of Facility objects. | ||
| def create_facilities(data) | ||
| data.map do |facility_data| |
| @@ -0,0 +1,25 @@ | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
This merge conflict should be a relatively easier merge fix, so I'd encourage you to use the VSCode merge editing tool with this one
| >>>>>>> feature/facility-class | ||
| ======= | ||
| # The VehicleFactory class creates Vehicle objects from external data sources. | ||
| class VehicleFactory |
There was a problem hiding this comment.
We'd want VehicleFactory to live in a separate file
| @facility.add_service('Vehicle Registration') | ||
| expect(@facility.services).to eq(['New Drivers License', 'Renew Drivers License', 'Vehicle Registration']) | ||
| end | ||
| it 'can register a vehicle and collect fees' do |
There was a problem hiding this comment.
It seems like this test was added but is not implemented. Be sure to run all your tests to make sure things are green! It's also helpful to refer back to the interaction pattern in order to prevent missing functionality
| before(:each) do | ||
| @factory = VehicleFactory.new | ||
| @data = [ | ||
| { vin_1_10: '123ABC4567', model_year: '2012', make: 'Toyota', model: 'Prius' }, |
There was a problem hiding this comment.
Nice used of stubbed (fake) data here!
No description provided.