Fixed broken test & refactored feature diff legends into a partial

baphled · Apr 20, 2010 · 7ee38da · 7ee38da
1 parent 4adca66
commit 7ee38da
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/app/views/features/_legend.html.erb b/app/views/features/_legend.html.erb
@@ -0,0 +1,4 @@
+<div class="legend highlighttable">
+  <p class="gd">Removing from <%=h diff_for %></p>
+  <p class="gi">Adding to <%=h diff_for %></p>
+</div>
diff --git a/app/views/features/merge.html.erb b/app/views/features/merge.html.erb
@@ -2,10 +2,7 @@
 <%= stylesheet_link_tag "pretty_diff" %>
 <% end %>
 
-<div class="legend highlighttable">
-  <p class="gd">Removing from file</p>
-  <p class="gi">Adding to file</p>
-</div>
+<%= render :partial => "legend", :locals => {:diff_for => "file"}  %>
 
 <span id="panel" class="ui-widget ui-widget-content ui-corner-all">
   <%= link_to 'Dry-run', file_merge_feature_path(@feature, :dry_run => true) %>

diff --git a/app/views/features/system_merge.html.erb b/app/views/features/system_merge.html.erb
@@ -2,10 +2,8 @@
 <%= stylesheet_link_tag "pretty_diff" %>
 <% end %>
 
-<div class="legend highlighttable">
-  <p class="gi">Adding to system</p>
-  <p class="gd">Removing from system</p>
-</div>
+<%= render :partial => "legend", :locals => {:diff_for => "system"}  %>
+
 <span id="panel" class="ui-widget ui-widget-content ui-corner-all">
   <%= link_to 'Update', system_sync_feature_path(@feature) %>
 </span>

diff --git a/features/plain/changes_view_improvements.feature b/features/plain/changes_view_improvements.feature
@@ -15,5 +15,5 @@ Feature: Changes view improvements
       |link           |system_or_file      |colour  |
       |merge changes  |Removing from file  |red     |
       |merge changes  |Adding to file      |green   |
-      |merge system   |Removing from system|green   |
+      |merge system   |Adding to system    |green   |
       |merge system   |Removing from system|red     |