SOME deduplication

pikesley · Jan 29, 2016 · 58a6341 · 58a6341
1 parent 6e08b27
commit 58a6341
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/app/views/glucose_measurements/index.html.erb b/app/views/glucose_measurements/index.html.erb
@@ -10,7 +10,11 @@
       </th>
     </tr>
     <% values.each do |value| %>
-      <%= render partial: 'shared/table_row', locals: {passed_value: value, fields: ['value']} %>
+      <%= render partial: 'shared/table_row', locals: {
+        passed_value: value,
+        fields: ['value'],
+        edit_path: edit_glucose_measurement_path(value)
+      } %>
     <% end %>
   <% end %>
 </table>

diff --git a/app/views/medication_events/index.html.erb b/app/views/medication_events/index.html.erb
@@ -9,18 +9,12 @@
         <%= date.strftime "%A %B #{date.day.ordinalize}" %>
       </th>
     </tr>
-    <% values.each do |v| %>
-      <tr>
-        <td>
-          <%= link_to v.datetime.strftime('%H:%M'), edit_medication_event_path(v) %>
-        </td>
-        <td>
-          <%= v.amount %>
-        </td>
-        <td>
-          <%= v.insulin %>
-        </td>
-      </tr>
+    <% values.each do |value| %>
+      <%= render partial: 'shared/table_row', locals: {
+        passed_value: value,
+        fields: ['amount', 'insulin'],
+        edit_path: edit_medication_event_path(value)
+      } %>
     <% end %>
   <% end %>
 </table>
diff --git a/app/views/shared/_table_row.html.erb b/app/views/shared/_table_row.html.erb
@@ -1,6 +1,6 @@
 <tr>
   <td>
-    <%= link_to passed_value.datetime.strftime('%H:%M'), edit_glucose_measurement_path(passed_value) %>
+    <%= link_to passed_value.datetime.strftime('%H:%M'), edit_path %>
   </td>
 
   <% fields.each do |field| %>

diff --git a/spec/requests/medication_events_spec.rb b/spec/requests/medication_events_spec.rb
@@ -20,6 +20,8 @@
     end
 
     it 'Edits an event' do
+      DatabaseCleaner.clean
+
       medication_event = create(:medication_event, datetime: '1992-06-15 12:00:00', amount: '7', insulin: 'humalog')
       visit medication_events_path(as: user)
       click_link '12:00'