Change Client#wrap_status and ClientAction#wrap_action enums' ':open' option to ':opened' to avoid conflict with reserved #open method.

Author: em77

app/helpers/client_actions_helper.rb

@@ -8,8 +8,14 @@ def client_wrap_action_prettified
   end
 
   def wrap_situation_prettified(wrap_text)
-    "<span class='#{wrap_text.to_s}_wrap bold_text'>
-      #{wrap_text.upcase.gsub(/_/,' ')}
+    if wrap_text.downcase == "opened"
+      new_wrap_text = "open"
+    else
+      new_wrap_text = wrap_text
+    end
+
+    "<span class='#{new_wrap_text.to_s}_wrap bold_text'>
+      #{new_wrap_text.upcase.gsub(/_/,' ')}
     </span>".html_safe
   end
 

app/models/client.rb

@@ -2,7 +2,7 @@ class Client < ApplicationRecord
   has_many :appointments, dependent: :destroy
   has_many :client_actions
   belongs_to :user, optional: true
-  enum wrap_status: [:open, :closed, :completed, :non_wrap]
+  enum wrap_status: [:opened, :closed, :completed, :non_wrap]
   after_initialize :set_default_wrap_status, if: :new_record?
 
   def set_default_wrap_status

app/models/client_action.rb

@@ -2,5 +2,5 @@ class ClientAction < ApplicationRecord
   belongs_to :client
   accepts_nested_attributes_for :client
   enum wrap_session: [:no, :yes]
-  enum wrap_action: [:open, :closed, :completed, :non_wrap, :no_change]
+  enum wrap_action: [:opened, :closed, :completed, :non_wrap, :no_change]
 end

app/views/client_actions/_form.html.erb

@@ -44,8 +44,9 @@
         <%= f.fields_for(client) do |fc| %>
           <%= fc.form_group :wrap_status,
             label: { text: "Change WRAP Status" } do %>
-            <span class="glyphicon glyphicon-folder-open" aria-hidden="true"></span>
-            <%= fc.radio_button :wrap_status, :open, label: "Open WRAP case",
+            <span class="glyphicon glyphicon-folder-open" aria-hidden="true">
+            </span>
+            <%= fc.radio_button :wrap_status, :opened, label: "Open WRAP case",
               inline: true %>
             <span class="glyphicon glyphicon-remove" aria-hidden="true"></span>
             <%= fc.radio_button :wrap_status, :closed, label: "Close WRAP case",

db/seeds.rb

@@ -26,7 +26,7 @@
   client_action.wrap_session = [0, 1].sample
   client_action.notes = Faker::Lorem.sentence
   client_action.client_id = client_id_array.sample
-  client_action.wrap_action = [:open, :closed, :completed, :non_wrap,
+  client_action.wrap_action = [:opened, :closed, :completed, :non_wrap,
     :no_change].sample
   random_date = Faker::Date.between(3.months.ago, Date.today)
   client_action.created_at = random_date

spec/features/create_client_action_spec.rb

@@ -29,12 +29,12 @@
   scenario "wrap_action should reflect changes to wrap_status" do
     visit client_path(@client)
     find_link("New Action").click
-    choose("client_action_client_wrap_status_open")
+    choose("client_action_client_wrap_status_opened")
     choose("client_action_wrap_session_yes")
     find_button("save_client_action").click
     expect(page).to have_content "Action saved successfully"
-    expect(ClientAction.find(1).wrap_action).to eq "open"
-    expect(Client.find(1).wrap_status).to eq "open"
+    expect(ClientAction.find(1).wrap_action).to eq "opened"
+    expect(Client.find(1).wrap_status).to eq "opened"
 
     within("div#client_action_#{@client_action.id}") do
       find_link("client_action_#{@client_action.id}_link").click
@@ -51,6 +51,6 @@
       find_link("client_action_2_link").click
     end
     expect(ClientAction.find(2).wrap_action).to eq "no_change"
-    expect(Client.find(1).wrap_status).to eq "open"
+    expect(Client.find(1).wrap_status).to eq "opened"
   end
 end