Fix code quality issues

publify · Jul 9, 2017 · 7a7882f · 7a7882f
1 parent 124aa58
commit 7a7882f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/publify_core/config/routes.rb b/publify_core/config/routes.rb
@@ -6,7 +6,7 @@
   get ':year', to: 'articles#index', year: /\d{4}/, as: 'articles_by_year', format: false
   get ':year/page/:page', to: 'articles#index', year: /\d{4}/, as: 'articles_by_year_page', format: false
 
-  get 'articles.:format', to: 'articles#index', constraints: {format: /rss|atom/}, as: 'articles_feed'
+  get 'articles.:format', to: 'articles#index', format: /rss|atom/, as: 'articles_feed'
 
   get 'sitemap.xml', to: 'xml#sitemap', format: 'googlesitemap'
 

diff --git a/publify_core/lib/sidebar_field.rb b/publify_core/lib/sidebar_field.rb
@@ -81,7 +81,7 @@ class CheckBoxField < self
     def line_html(sidebar)
       content = hidden_field_tag(input_name(sidebar), 0) +
         content_tag('label',
-                    safe_join([check_box_tag(input_name(sidebar), 1, current_value(sidebar), options), label], ' '))
+                    check_box_tag(input_name(sidebar), 1, current_value(sidebar), options) + label)
       content_tag('div', content, class: 'checkbox')
     end
 

diff --git a/spec/models/sidebar_registry_spec.rb b/spec/models/sidebar_registry_spec.rb
@@ -3,20 +3,19 @@
 describe SidebarRegistry do
   describe '#available_sidebars' do
     it 'finds at least the standard sidebars' do
-      expect(SidebarRegistry.available_sidebars).to include(
-        AmazonSidebar,
-        ArchivesSidebar,
-        AuthorsSidebar,
-        LivesearchSidebar,
-        MetaSidebar,
-        NotesSidebar,
-        PageSidebar,
-        PopularSidebar,
-        SearchSidebar,
-        StaticSidebar,
-        TagSidebar,
-        XmlSidebar
-      )
+      expect(SidebarRegistry.available_sidebars).
+        to include(AmazonSidebar,
+                   ArchivesSidebar,
+                   AuthorsSidebar,
+                   LivesearchSidebar,
+                   MetaSidebar,
+                   NotesSidebar,
+                   PageSidebar,
+                   PopularSidebar,
+                   SearchSidebar,
+                   StaticSidebar,
+                   TagSidebar,
+                   XmlSidebar)
     end
   end
 end