[frontend] EventMailer views now use locals

openSUSE · Jun 29, 2017 · a1e23a6 · a1e23a6
1 parent 19880d6
commit a1e23a6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/api/app/models/notification/rss_feed_item.rb b/src/api/app/models/notification/rss_feed_item.rb
@@ -27,7 +27,8 @@ def description
       template: "event_mailer/#{event.template_name}",
       layout: false,
       format: :txt,
-      assigns: { e: event.expanded_payload, host: ::Configuration.obs_url, configuration: ::Configuration.first })
+      assigns: { host: ::Configuration.obs_url, configuration: ::Configuration.first },
+      locals: { event: event})
   end
 end
 

diff --git a/src/api/app/views/webui/feeds/notifications.rss.builder b/src/api/app/views/webui/feeds/notifications.rss.builder
@@ -13,7 +13,7 @@ xml.rss version: '2.0' do
         xml.description notification.description
         xml.category "#{notification.event_type}/#{notification.subscription_receiver_role}"
         xml.pubDate notification.created_at
-        xml.author "#{@configuration['title']}"
+        xml.author @configuration['title'].to_s
       end
     end
   end

diff --git a/src/api/spec/models/notification/rss_feed_item_spec.rb b/src/api/spec/models/notification/rss_feed_item_spec.rb
@@ -15,7 +15,7 @@
     let(:greater_than_max_items_per_group) { max_items_per_group + 5 }
 
     context 'without any RSS items' do
-      it { expect { Notification::RssFeedItem.cleanup }.not_to change { Notification::RssFeedItem.count } }
+      it { expect{ Notification::RssFeedItem.cleanup }.not_to(change{ Notification::RssFeedItem.count }) }
     end
 
     context 'with a single users' do
@@ -24,7 +24,7 @@
           create_list(:rss_notification, max_items_per_user, subscriber: user)
         end
 
-        it { expect { Notification::RssFeedItem.cleanup }.not_to change { Notification::RssFeedItem.count } }
+        it { expect { Notification::RssFeedItem.cleanup }.not_to(change { Notification::RssFeedItem.count }) }
       end
 
       context 'and enough RSS items' do
@@ -95,7 +95,8 @@
         template: "event_mailer/#{delete_package_event.template_name}",
         layout: false,
         format: :txt,
-        assigns: { e: delete_package_event.expanded_payload, host: ::Configuration.obs_url, configuration: ::Configuration.first })
+        assigns: { host: ::Configuration.obs_url, configuration: ::Configuration.first },
+        locals: { event: delete_package_event })
     end
     subject { create(:rss_notification, event_type: 'Event::DeletePackage', event_payload: payload) }