From ec31b616982f137abdee8d0c6aa9dc4a6d103189 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 18 Jul 2016 21:26:30 +0000
Subject: Removes calls to #assert_template and #assigns in functional tests.

git-svn-id: http://svn.redmine.org/redmine/trunk@15695 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/activities/index.html.erb | 2 +-
 app/views/boards/show.html.erb      | 2 +-
 app/views/issues/_conflict.html.erb | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'app')

diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb
index 8f5cd08e6..033ae3cb6 100644
--- a/app/views/activities/index.html.erb
+++ b/app/views/activities/index.html.erb
@@ -46,7 +46,7 @@
 <% end %>
 
 <% content_for :sidebar do %>
-<%= form_tag({}, :method => :get) do %>
+<%= form_tag({}, :method => :get, :id => 'activity_scope_form') do %>
 <h3><%= l(:label_activity) %></h3>
 <ul>
 <% @activity.event_types.each do |t| %>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
index a9734318a..b032a5939 100644
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -35,7 +35,7 @@
   </tr></thead>
   <tbody>
   <% @topics.each do |topic| %>
-    <tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
+    <tr id="message-<%= topic.id %>" class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
       <td class="subject"><%= link_to topic.subject, board_message_path(@board, topic) %></td>
       <td class="author"><%= link_to_user(topic.author) %></td>
       <td class="created_on"><%= format_time(topic.created_on) %></td>
diff --git a/app/views/issues/_conflict.html.erb b/app/views/issues/_conflict.html.erb
index c13ace665..ea4c35d7d 100644
--- a/app/views/issues/_conflict.html.erb
+++ b/app/views/issues/_conflict.html.erb
@@ -3,6 +3,7 @@
   <% if @conflict_journals.present? %>
     <div class="conflict-details">
     <% @conflict_journals.sort_by(&:id).each do |journal| %>
+      <div class="conflict-journal">
       <p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p>
       <% if journal.details.any? %>
       <ul class="details">
@@ -14,6 +15,7 @@
       <div class="wiki">
         <%= textilizable(journal, :notes) unless journal.notes.blank? %>
       </div>
+      </div>
     <% end %>
     </div>
   <% end %>
-- 
cgit v1.2.3