From a03bc2789da972fd407c8aa563dbc56f6d9a0e72 Mon Sep 17 00:00:00 2001 From: Jason Berlinsky Date: Thu, 17 Mar 2016 01:40:40 -0400 Subject: [PATCH] Clean up pull request --- app/views/fields/select/_index.html.erb | 2 +- app/views/fields/select/_show.html.erb | 2 +- spec/features/edit_page_spec.rb | 11 ----------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/app/views/fields/select/_index.html.erb b/app/views/fields/select/_index.html.erb index 4b6eeb28d3..79878c08d4 100644 --- a/app/views/fields/select/_index.html.erb +++ b/app/views/fields/select/_index.html.erb @@ -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 %> diff --git a/app/views/fields/select/_show.html.erb b/app/views/fields/select/_show.html.erb index 0569df2a61..0eda05864a 100644 --- a/app/views/fields/select/_show.html.erb +++ b/app/views/fields/select/_show.html.erb @@ -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 %> diff --git a/spec/features/edit_page_spec.rb b/spec/features/edit_page_spec.rb index 972b847e85..0688ac898d 100644 --- a/spec/features/edit_page_spec.rb +++ b/spec/features/edit_page_spec.rb @@ -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