[WIP] Fix: deprecation warnings when running spec suite

AyuntamientoMadrid · Jan 5, 2018 · 4595d63 · 4595d63
1 parent bf25367
commit 4595d63
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/app/views/layouts/_admin_sidebar.html.erb b/app/views/layouts/_admin_sidebar.html.erb
@@ -18,9 +18,9 @@
     <% end %>
     <% if current_user.user? %>
       <li class="<%= active_menu('events', nil, 'events') %>">
-        <a href="<%= events_path(event_fixed_filters['events']) %>">
+        <%= link_to events_path(event_fixed_filters['events']) do %>
           <i class="fi-book size-18"> <%= t("organizations.show.events_title") %></i>
-        </a>
+          <% end %>
       </li>
     <% else %>
       <li class="<%= active_menu('events') %>">
@@ -56,11 +56,11 @@
     <% end %>
     <% if current_user.user? %>
       <li class="<%= active_menu('events', nil, 'tray') %>">
-        <a href="<%= events_path(event_fixed_filters['tray']) %>">
+        <%= events_path(event_fixed_filters['tray']) do %>
           <i class="fi-calendar size-18">
             <%= t("backend.event_tray") %>
           </i>
-        </a>
+        <% end %>
       </li>
     <% end %>
     <% if current_user.admin? %>

diff --git a/spec/features/admin/events_spec.rb b/spec/features/admin/events_spec.rb
@@ -13,9 +13,9 @@
     describe "index" do
 
       scenario 'visit the events index page' do
-        visit events_path("utf8" => "✓", "search_title" => "", "search_person" => "",
-                          "status" => ["requested", "declined"], "lobby_activity" => "1",
-                          "controller" => "events", "action" => "index" )
+        visit events_path(utf8: "✓", search_title: "", search_person: "",
+                          status: ["requested", "declined"], lobby_activity: "1",
+                          controller: "events", action: "index")
         expect(page).to have_content "Eventos"
         expect(page).to have_content I18n.t 'backend.event_tray'
       end
@@ -43,9 +43,9 @@
         event9.update(status: :canceled)
         event10.update(status: :declined)
 
-        visit events_path("utf8" => "✓", "search_title" => "", "search_person" => "",
-                          "status" => ["requested", "declined"], "lobby_activity" => "1",
-                          "controller" => "events", "action" => "index" )
+        visit events_path(utf8: "✓", search_title: "", search_person: "",
+                          status: ["requested", "declined"], lobby_activity: "1",
+                          controller: "events", action: "index")
 
         click_link "Eventos"
         expect(find_link(I18n.t("backend.event_tray")).first(:xpath, ".//..")[:class]).not_to eq "active"
@@ -75,9 +75,9 @@
         event = create(:event, position: @position)
         create(:attachment, event: event, title: "An amazing attachment title")
         create(:attachment, event: event, title: "Other title")
-        visit events_path("utf8" => "✓", "search_title" => "", "search_person" => "",
-                          "status" => ["accepted", "canceled", "declined"],
-                          "controller" => "events", "action" => "index" )
+        visit events_path(utf8: "✓", search_title: "", search_person: "",
+                          status: ["accepted", "canceled", "declined"],
+                          controller: "events", action: "index")
 
         within "#event_#{event.id}" do
           find('.attachments-dropdown').click