Add test for link href

redmine-patch-meetup · Feb 5, 2021 · ad85fdc · ad85fdc
1 parent b1951bc
commit ad85fdc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb
@@ -16,7 +16,7 @@
       <%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
       <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') %>
       <% @redirects_to_self.map { |redirect| %>
-        <%= link_to("Delete redirect from #{WikiPage.pretty_title(redirect.title)}", {:controller => 'wiki_redirects', :action => 'destroy', :project_id => @project.id, :wiki_page_id => @page.title, :id => redirect.id}, :method => :delete, :class => 'icon icon-link-break') %>
+        <%= link_to("Delete redirect from #{WikiPage.pretty_title(redirect.title)}", {:controller => 'wiki_redirects', :action => 'destroy', :project_id => @project.identifier, :wiki_page_id => @page.title, :id => redirect.id}, :method => :delete, :class => 'icon icon-link-break') %>
       <% } %>
       <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :id => @page.title}, :method => :delete, :data => {:confirm => l(:text_are_you_sure)}, :class => 'icon icon-del') %>
     <% else %>

diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
@@ -198,14 +198,18 @@ def test_show_delete_redirect_links
     wiki_page.title = new_title
     wiki_page.save
 
-    get :show, :params => {:project_id => 1, :id => new_title}
+    redirect1 = WikiRedirect.find_by(title: 'CookBook_documentation', redirects_to: 'New_Cookbook')
+    redirect2 = WikiRedirect.find_by(title: 'Old_Cookbook', redirects_to: 'New_Cookbook')
+
+    get :show, :params => {:project_id => 'ecookbook', :id => new_title}
 
     assert_select '.drdn-items' do
-      # TODO: Assert correct link
-      # assert_select 'a.icon-link-break[href=?]', '/projects/ecookbook/wiki/redirects/', text: 'Delete redirect from CookBook documentation'
-      # assert_select 'a.icon-link-break[href=?]', '/projects/ecookbook/wiki/redirects/', text: 'Delete redirect from Old Cookbook'
-      assert_select 'a.icon-link-break', text: 'Delete redirect from CookBook documentation'
-      assert_select 'a.icon-link-break', text: 'Delete redirect from Old Cookbook'
+      assert_select 'a.icon-link-break[href=?]',
+                    "/projects/ecookbook/wiki/#{new_title}/redirects/#{redirect1.id}",
+                    text: 'Delete redirect from CookBook documentation'
+      assert_select 'a.icon-link-break[href=?]',
+                    "/projects/ecookbook/wiki/#{new_title}/redirects/#{redirect2.id}",
+                    text: 'Delete redirect from Old Cookbook'
     end
   end