Merge pull request #2794 from consul/fix_notifiable_delegation

Try if notifiable has notifiable methods

app/views/notifications/_notification.html.erb

@@ -1,5 +1,5 @@
 <li id="<%= dom_id(notification) %>" class="notification <%= 'unread' if notification&.unread? %>">
-  <% if notification.try(:notifiable_available?) %>
+  <% if notification.notifiable.try(:notifiable_available?) %>
     <% locals = { notification: notification,
                   timestamp: notification.timestamp,
                   title: notification.notifiable_title,

spec/features/notifications_spec.rb

@@ -128,6 +128,14 @@ feature "Notifications" do
     expect(page).to_not have_css("#notifications")
   end
 
+  scenario "Notification's notifiable model no longer includes Notifiable module" do
+    create(:notification, notifiable: create(:spending_proposal), user: user)
+    create(:notification, notifiable: create(:poll_question), user: user)
+
+    click_notifications_icon
+    expect(page).to have_content('This resource is not available anymore.', count: 2)
+  end
+
   context "Admin Notifications" do
     let(:admin_notification) do
       create(:admin_notification, title: 'Notification title',