Skip to content

Commit 646126b

Browse files
committed
Add test for link href
1 parent 76dcc69 commit 646126b

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

app/views/wiki/show.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :id => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
1717
<%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :id => @page.title}, :class => 'icon icon-move') %>
1818
<% @redirects_to_self.map { |redirect| %>
19-
<%= 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') %>
19+
<%= 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') %>
2020
<% } %>
2121
<%= 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') %>
2222
<% else %>

test/functional/wiki_controller_test.rb

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,18 @@ def test_show_delete_redirect_links
198198
wiki_page.title = new_title
199199
wiki_page.save
200200

201-
get :show, :params => {:project_id => 1, :id => new_title}
201+
redirect1 = WikiRedirect.find_by(title: 'CookBook_documentation', redirects_to: 'New_Cookbook')
202+
redirect2 = WikiRedirect.find_by(title: 'Old_Cookbook', redirects_to: 'New_Cookbook')
203+
204+
get :show, :params => {:project_id => 'ecookbook', :id => new_title}
202205

203206
assert_select '.drdn-items' do
204-
# TODO: Assert correct link
205-
# assert_select 'a.icon-link-break[href=?]', '/projects/ecookbook/wiki/redirects/', text: 'Delete redirect from CookBook documentation'
206-
# assert_select 'a.icon-link-break[href=?]', '/projects/ecookbook/wiki/redirects/', text: 'Delete redirect from Old Cookbook'
207-
assert_select 'a.icon-link-break', text: 'Delete redirect from CookBook documentation'
208-
assert_select 'a.icon-link-break', text: 'Delete redirect from Old Cookbook'
207+
assert_select 'a.icon-link-break[href=?]',
208+
"/projects/ecookbook/wiki/#{new_title}/redirects/#{redirect1.id}",
209+
text: 'Delete redirect from CookBook documentation'
210+
assert_select 'a.icon-link-break[href=?]',
211+
"/projects/ecookbook/wiki/#{new_title}/redirects/#{redirect2.id}",
212+
text: 'Delete redirect from Old Cookbook'
209213
end
210214
end
211215

0 commit comments

Comments
 (0)