Skip to content

Commit

Permalink
Clean up pull request
Browse files Browse the repository at this point in the history
  • Loading branch information
Jberlinsky committed Mar 17, 2016
1 parent 01bc9ac commit a03bc27
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
2 changes: 1 addition & 1 deletion app/views/fields/select/_index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ to be displayed on a resource's index page.
[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Select
%>

<%= field.data.presence %>
<%= field.data %>
2 changes: 1 addition & 1 deletion app/views/fields/select/_show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ to be displayed on a resource's show page.
[1]: http://www.rubydoc.info/gems/administrate/Administrate/Field/Select
%>

<%= field.data.presence %>
<%= field.data %>
11 changes: 0 additions & 11 deletions spec/features/edit_page_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,10 @@
customer = create(:customer, kind: :standard)

visit edit_admin_customer_path(customer)

select "vip", from: "Kind"

click_on "Update Customer"

expect(page).to have_content("KIND")
expect(page).to have_content("vip")

click_on "Edit"

select "standard", from: "Kind"

click_on "Update Customer"

expect(page).to have_content("KIND")
expect(page).to have_content("standard")
end
end

0 comments on commit a03bc27

Please sign in to comment.