Merge pull request #1008 from denny/dev/pager

Add translations for more model names, use them in pager info

plugins/ShinyAccess/app/views/shiny_access/admin/groups/index.html.erb

@@ -36,4 +36,4 @@
   <tbody>
 </table>
 
-<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy } %>
+<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy, name: @groups.name } %>

plugins/ShinyAccess/app/views/shiny_access/admin/memberships/index.html.erb

@@ -50,7 +50,7 @@
 
 <% else %>
 <p>
-  <%= t( 'shinycms.empty_list', items: 'memberships' ) %>
+  <%= t( 'shinycms.empty_list', items: t( 'shinycms.models.names.shiny_access_membership' ).pluralize ) %>
 </p>
 <% end %>
 

plugins/ShinyAccess/config/locales/en.yml

@@ -11,6 +11,11 @@ en:
     feature_flags:
       access: Access Control
 
+    models:
+      names:
+        shiny_access_group: access group
+        shiny_access_membership: access group membership
+
   shiny_access:
     admin:
       menu: Access

plugins/ShinyAccess/spec/requests/shiny_access/admin/groups_controller_controller_spec.rb → plugins/ShinyAccess/spec/requests/shiny_access/admin/groups_controller_spec.rb

@@ -15,11 +15,30 @@
   end
 
   describe 'GET /admin/access/groups' do
-    it 'displays the list of access groups' do
-      get shiny_access.groups_path
+    context 'when there are no groups' do
+      it "displays the 'no groups found' message" do
+        get shiny_access.groups_path
 
-      expect( response      ).to have_http_status :ok
-      expect( response.body ).to have_title I18n.t( 'shiny_access.admin.groups.index.title' ).titlecase
+        pager_info = 'No access groups found'
+
+        expect( response      ).to have_http_status :ok
+        expect( response.body ).to have_title I18n.t( 'shiny_access.admin.groups.index.title' ).titlecase
+        expect( response.body ).to have_css '.pager-info', text: pager_info
+      end
+    end
+
+    context 'when there are some groups' do
+      it 'displays the list of access groups' do
+        create_list :access_group, 3
+
+        get shiny_access.groups_path
+
+        pager_info = 'Displaying 3 access groups'
+
+        expect( response      ).to have_http_status :ok
+        expect( response.body ).to have_title I18n.t( 'shiny_access.admin.groups.index.title' ).titlecase
+        expect( response.body ).to have_css '.pager-info', text: pager_info
+      end
     end
   end
 

plugins/ShinyAccess/spec/requests/shiny_access/admin/memberships_controller_spec.rb

@@ -17,11 +17,23 @@
   let( :group1 ) { create :access_group }
 
   describe 'GET /admin/access/groups/1/memberships' do
+    it "displays the 'no items found' message" do
+      get shiny_access.group_memberships_path( group1 )
+
+      expect( response      ).to have_http_status :ok
+      expect( response.body ).to have_title I18n.t( 'shiny_access.admin.memberships.index.title', name: group1.internal_name ).titlecase
+      expect( response.body ).to have_css 'p', text: 'No access group memberships found'
+    end
+
     it 'displays the list of access group memberships' do
+      item1 = create :access_membership, group: group1
+      create :access_membership, group: group1
+
       get shiny_access.group_memberships_path( group1 )
 
       expect( response      ).to have_http_status :ok
       expect( response.body ).to have_title I18n.t( 'shiny_access.admin.memberships.index.title', name: group1.internal_name ).titlecase
+      expect( response.body ).to have_css 'td', text: item1.user.username
     end
   end
 

plugins/ShinyBlog/app/views/shiny_blog/admin/blog_posts/index.html.erb

@@ -42,4 +42,4 @@
   </tbody>
 </table>
 
-<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy } %>
+<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy, name: @posts.name } %>

plugins/ShinyBlog/spec/requests/shiny_blog/admin/blog_posts_controllers_spec.rb

@@ -18,46 +18,56 @@
   let( :admin ) { ShinyCMS::User.first }
 
   describe 'GET /admin/blog' do
-    it 'fetches the list of blog posts with less than one page of posts' do
-      create :blog_post
-      create :blog_post
-      create :blog_post
+    context 'when there are no posts' do
+      it "displays the 'no blog posts found' message" do
+        get shiny_blog.blog_posts_path
 
-      get shiny_blog.blog_posts_path
+        pager_info = 'No blog posts found'
 
-      expect( response ).to have_http_status :ok
-      expect( response.body ).to have_title I18n.t( 'shiny_blog.admin.blog_posts.index.title' ).titlecase
+        expect( response      ).to have_http_status :ok
+        expect( response.body ).to have_title I18n.t( 'shiny_blog.admin.blog_posts.index.title' ).titlecase
+        expect( response.body ).to have_css '.pager-info', text: pager_info
+      end
     end
 
-    it 'fetches the list of blog posts when its empty' do
-      get shiny_blog.blog_posts_path
+    context 'when there are less than one page of posts' do
+      it 'displays the list of blog posts' do
+        create_list :blog_post, 3
 
-      expect( response ).to have_http_status :ok
-      expect( response.body ).to have_title I18n.t( 'shiny_blog.admin.blog_posts.index.title' ).titlecase
+        get shiny_blog.blog_posts_path
+
+        pager_info = 'Displaying 3 blog posts'
+
+        expect( response      ).to have_http_status :ok
+        expect( response.body ).to have_title I18n.t( 'shiny_blog.admin.blog_posts.index.title' ).titlecase
+        expect( response.body ).to have_css '.pager-info', text: pager_info
+      end
     end
 
-    it 'fetches the list of blog posts with more than one page of posts' do
-      create_list :blog_post, 12
+    context 'when there are more than one page of posts' do
+      it 'fetches the first page' do
+        create_list :blog_post, 12
 
-      get shiny_blog.blog_posts_path
+        get shiny_blog.blog_posts_path
 
-      pager_info = 'Displaying items 1-10 of 12 in total'  # FIXME: i18n
+        pager_info = 'Displaying blog posts 1-10 of 12 in total'
 
-      expect( response ).to have_http_status :ok
-      expect( response.body ).to have_title I18n.t( 'shiny_blog.admin.blog_posts.index.title' ).titlecase
-      expect( response.body ).to have_css '.pager-info', text: pager_info
-    end
+        expect( response      ).to have_http_status :ok
+        expect( response.body ).to have_title I18n.t( 'shiny_blog.admin.blog_posts.index.title' ).titlecase
+        expect( response.body ).to have_css '.pager-info', text: pager_info
+      end
 
-    it 'fetches the second page of blog posts' do
-      create_list :blog_post, 12
+      it 'fetches the second page when requested' do
+        create_list :blog_post, 12
 
-      get shiny_blog.blog_posts_path, params: { page: 2 }
+        get shiny_blog.blog_posts_path, params: { page: 2 }
 
-      pager_info = 'Displaying items 11-12 of 12 in total'  # FIXME: i18n
+        pager_info = 'Displaying blog posts 11-12 of 12 in total'
 
-      expect( response ).to have_http_status :ok
-      expect( response.body ).to have_title I18n.t( 'shiny_blog.admin.blog_posts.index.title' ).titlecase
-      expect( response.body ).to have_css '.pager-info', text: pager_info
+        expect( response      ).to have_http_status :ok
+        expect( response.body ).to have_title I18n.t( 'shiny_blog.admin.blog_posts.index.title' ).titlecase
+        expect( response.body ).to have_css '.pager-info', text: pager_info
+      end
     end
   end
 

plugins/ShinyCMS/app/views/shinycms/admin/comments/index.html.erb

@@ -47,7 +47,7 @@
 </table>
 <% end %>
 
-<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy } %>
+<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy, name: @comments.name } %>
 
 <script>
   function toggle_select_all() {

plugins/ShinyCMS/app/views/shinycms/admin/consent_versions/index.html.erb

@@ -48,4 +48,4 @@
   <tbody>
 </table>
 
-<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy } %>
+<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy, name: @consent_versions.name } %>

plugins/ShinyCMS/app/views/shinycms/admin/email_recipients/index.html.erb

@@ -46,4 +46,4 @@
   <tbody>
 </table>
 
-<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy } %>
+<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy, name: @recipients.name } %>

plugins/ShinyCMS/app/views/shinycms/admin/email_stats/index.html.erb

@@ -46,7 +46,7 @@
   </tbody>
 </table>
 
-<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy } %>
+<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy, name: @messages.name } %>
 
 <% else %>
 <p>

plugins/ShinyCMS/app/views/shinycms/admin/includes/_pager.html.erb

@@ -1,7 +1,21 @@
+<%
+  name ||= 'Item'
+  i18n_key = name.underscore.tr '/', '_'
+
+  if I18n.exists? "shinycms.models.names.#{i18n_key}"
+    items = t( "shinycms.models.names.#{i18n_key}" ).pluralize
+  elsif I18n.exists? 'shinycms.models.names.item'
+    items = t( 'shinycms.models.names.item' ).pluralize
+  else
+    items = 'items'
+  end
+%>
+
 <%== pagy_bootstrap_nav pagy %>
 
 <p class="pager-info">
-  <%== pagy_info pagy %>
+  <%== pagy_info pagy, items %>
+
   <%# TODO: FIXME: Oh look, the JavaScript isn't working. How terribly unusual. %#>
   <br>
   <%== pagy_items_selector_js pagy %>

plugins/ShinyCMS/app/views/shinycms/admin/users/index.html.erb

@@ -40,4 +40,4 @@
   <tbody>
 </table>
 
-<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy } %>
+<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy, name: @users.name } %>

plugins/ShinyCMS/app/views/shinycms/admin/web_stats/index.html.erb

@@ -43,11 +43,6 @@
     <% end %>
   </tbody>
 </table>
-
-<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy } %>
-
-<% else %>
-<p>
-  <%= t( 'shinycms.empty_list', items: 'stats' ) %>
-</p>
 <% end %>
+
+<%= render partial: 'admin/includes/pager', locals: { pagy: @pagy, name: @visits.name } %>

plugins/ShinyCMS/config/locales/en.yml

@@ -216,6 +216,14 @@ en:
     # Models
 
     models:
+      names:
+        item: item  # generic fallback
+        ahoy_visit: visit
+        shinycms_comment: comment
+        shinycms_consent_version: consent version
+        shinycms_email_recipient: email recipient
+        shinycms_user: user
+
       anonymous_author:
         anonymous: Anonymous
 

plugins/ShinyCMS/spec/requests/shinycms/admin/comments_controller_spec.rb

@@ -31,34 +31,48 @@
   end
 
   describe 'GET /admin/comments' do
-    it 'fetches the spam comment moderation page' do
-      create :comment, spam: true
-      create :comment, spam: true
-      comment3 = create :comment, spam: true
+    context 'when there are no spam comments' do
+      it "displays the 'no comments found' message" do
+        get shinycms.comments_path
 
-      get shinycms.comments_path
+        pager_info = 'No comments found'
 
-      expect( response      ).to have_http_status :ok
-      expect( response.body ).to have_title I18n.t( 'shinycms.admin.comments.index.title' ).titlecase
-      expect( response.body ).to have_css 'td', text: comment3.title
+        expect( response      ).to have_http_status :ok
+        expect( response.body ).to have_title I18n.t( 'shinycms.admin.comments.index.title' ).titlecase
+        expect( response.body ).to have_css '.pager-info', text: pager_info
+      end
     end
 
-    describe 'GET /admin/comments/search?q=zing' do
-      it 'fetches the list of matching spam comments' do
-        comment1 = create :comment, body: 'Zebras are zingy', spam: true
-        comment2 = create :comment, body: 'Aardvarks are awesome', spam: true
+    context 'when there are spam comments' do
+      it 'displays the list of comments' do
+        create_list :comment, 3, spam: true
+
+        get shinycms.comments_path
 
-        get shinycms.search_comments_path, params: { q: 'zing' }
+        pager_info = 'Displaying 3 comments'
 
         expect( response      ).to have_http_status :ok
         expect( response.body ).to have_title I18n.t( 'shinycms.admin.comments.index.title' ).titlecase
-
-        expect( response.body ).to     have_css 'td', text: comment1.title
-        expect( response.body ).not_to have_css 'td', text: comment2.title
+        expect( response.body ).to have_css '.pager-info', text: pager_info
       end
     end
   end
 
+  describe 'GET /admin/comments/search?q=zing' do
+    it 'fetches the list of matching spam comments' do
+      comment1 = create :comment, body: 'Zebras are zingy', spam: true
+      comment2 = create :comment, body: 'Aardvarks are awesome', spam: true
+
+      get shinycms.search_comments_path, params: { q: 'zing' }
+
+      expect( response      ).to have_http_status :ok
+      expect( response.body ).to have_title I18n.t( 'shinycms.admin.comments.index.title' ).titlecase
+
+      expect( response.body ).to     have_css 'td', text: comment1.title
+      expect( response.body ).not_to have_css 'td', text: comment2.title
+    end
+  end
+
   describe 'PUT /admin/comments' do
     it 'reminds you that you need to select spam or not spam, if you do neither' do
       put shinycms.comments_path, params: {}

plugins/ShinyCMS/spec/requests/shinycms/admin/consent_versions_controller_spec.rb

@@ -16,14 +16,16 @@
   end
 
   describe 'GET /admin/consent-versions' do
-    it 'fetches the list of consent versions' do
-      version = create :consent_version
+    it 'displays the list of consent versions' do
+      create_list :consent_version, 3
 
       get shinycms.consent_versions_path
 
+      pager_info = 'Displaying 4 consent versions'  # including one from seed data
+
       expect( response      ).to have_http_status :ok
       expect( response.body ).to have_title I18n.t( 'shinycms.admin.consent_versions.index.title' ).titlecase
-      expect( response.body ).to have_css 'td', text: version.name
+      expect( response.body ).to have_css '.pager-info', text: pager_info
     end
   end
 

plugins/ShinyCMS/spec/requests/shinycms/admin/email_recipients_controller_spec.rb

@@ -16,26 +16,30 @@
   end
 
   describe 'GET /admin/email-recipients' do
-    it 'fetches the list of email recipients' do
-      recipient1 = create :email_recipient
-      create :email_recipient
-      create :email_recipient
+    context 'when there are no email recipients' do
+      it "displays the 'no email recipients found' message" do
+        get shinycms.email_recipients_path
 
-      get shinycms.email_recipients_path
+        pager_info = 'No email recipients found'
 
-      expect( response      ).to have_http_status :ok
-      expect( response.body ).to have_title I18n.t( 'shinycms.admin.email_recipients.index.title' ).titlecase
-      expect( response.body ).to have_css 'td', text: recipient1.name
+        expect( response      ).to have_http_status :ok
+        expect( response.body ).to have_title I18n.t( 'shinycms.admin.email_recipients.index.title' ).titlecase
+        expect( response.body ).to have_css '.pager-info', text: pager_info
+      end
     end
 
-    it 'displays an appropriate message if there are no email recipients yet' do
-      get shinycms.email_recipients_path
+    context 'when there are email recipients' do
+      it 'displays the list of email recipients' do
+        create_list :email_recipient, 3
 
-      none_found = 'No items found'  # TODO: i18n
+        get shinycms.email_recipients_path
 
-      expect( response      ).to have_http_status :ok
-      expect( response.body ).to have_title I18n.t( 'shinycms.admin.email_recipients.index.title' ).titlecase
-      expect( response.body ).to have_css 'p', text: none_found
+        pager_info = 'Displaying 3 email recipients'
+
+        expect( response      ).to have_http_status :ok
+        expect( response.body ).to have_title I18n.t( 'shinycms.admin.email_recipients.index.title' ).titlecase
+        expect( response.body ).to have_css '.pager-info', text: pager_info
+      end
     end
   end