Skip to content
This repository has been archived by the owner on Jan 5, 2021. It is now read-only.

update styles & modify html.erb to function with the new styles #17

Merged
merged 3 commits into from Jul 13, 2018

Conversation

chrisbohn8
Copy link
Collaborator

The updated styles should be ready to merge into the master branch. Feel free to test on the styles-testing branch before you pull into the master. Let me know if I need to make any other changes.

Copy link
Contributor

@stephenyeargin stephenyeargin left a comment

Choose a reason for hiding this comment

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

Most of my notes are about the test suite, which can be run via bundle exec rake test.

We can also remove bulma from the Gemfile since it's no longer in use (with bundle install run afterwards to drop it from Gemfile.lock).

<span class="has-text-grey-light">/</span>
$<%= guest_beer.price %>

<!-- Wine & Cider List -->
Copy link
Contributor

Choose a reason for hiding this comment

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

This version of the application does have a data model for these items, though they are not exposed in ActiveAdmin yet. Not really sure if we should opt to include them in the view and ditch the "Guest Beers" object (already a misnomer).

$<%= guest_beer.price %>

<!-- Wine & Cider List -->
<div id="wine-cider" class="beer">
Copy link
Contributor

Choose a reason for hiding this comment

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

Tests will fail here as well, because it will see 12 .beer classes (11 from the fixtures, 1 here) instead of the expected 11.

https://github.com/ENBW/enbw/blob/a0dd616b44e5114ed82ab18e2fdea4fb373a85d7/test/controllers/static_controller_test.rb#L9

@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Beer List :: East Nashville Beer Works</title>
<title>ENBW Beer List</title>
Copy link
Contributor

Choose a reason for hiding this comment

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

Previous review omitted this comment:

This change will break the test suite, as seen here. We would likely want to update it accordingly.

https://github.com/ENBW/enbw/blob/a0dd616b44e5114ed82ab18e2fdea4fb373a85d7/test/controllers/static_controller_test.rb#L8

@stephenyeargin
Copy link
Contributor

We discussed this offline last night, and this good to merge for now. The outlined tasks can be addressed in future PRs.

@stephenyeargin stephenyeargin merged commit 8d78ad4 into master Jul 13, 2018
@stephenyeargin stephenyeargin deleted the styles-testing branch July 13, 2018 21:58
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants