From 0808d578d0cb34096d0791955eecabb1f3ab0f47 Mon Sep 17 00:00:00 2001
From: Yomi Colledge <baphled@boodah.net>
Date: Wed, 21 Apr 2010 12:06:54 +0100
Subject: [PATCH] Added markup to get our steps to pass. Will dress it up
 later.

---
 app/views/features/merge.html.erb              | 2 ++
 app/views/features/system_merge.html.erb       | 2 ++
 features/step_definitions/diff_legend_steps.rb | 6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/app/views/features/merge.html.erb b/app/views/features/merge.html.erb
index d4f5b32d..bd6062e0 100644
--- a/app/views/features/merge.html.erb
+++ b/app/views/features/merge.html.erb
@@ -4,6 +4,8 @@
 
 <%= render :partial => "legend", :locals => {:diff_from => "file", :diff_to => "file"}  %>
 
+<div class="notice">This will change the source file. Unless you use source control, you may lose all changes</div>
+
 <span id="panel" class="ui-widget ui-widget-content ui-corner-all">
   <%= link_to 'Dry-run', file_merge_feature_path(@feature, :dry_run => true) %>
   <%= link_to 'Patch', file_merge_feature_path(@feature) %>
diff --git a/app/views/features/system_merge.html.erb b/app/views/features/system_merge.html.erb
index 6d49a081..434e2f8a 100644
--- a/app/views/features/system_merge.html.erb
+++ b/app/views/features/system_merge.html.erb
@@ -4,6 +4,8 @@
 
 <%= render :partial => "legend", :locals => {:diff_from => "system", :diff_to => "system"}  %>
 
+<div class="notice">This will change will update the system feature</div>
+
 <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/step_definitions/diff_legend_steps.rb b/features/step_definitions/diff_legend_steps.rb
index 7a303f95..fab31060 100644
--- a/features/step_definitions/diff_legend_steps.rb
+++ b/features/step_definitions/diff_legend_steps.rb
@@ -3,4 +3,10 @@
   response.should have_selector :span, attribute = {:class => legend_class} do |content|
     content.should contain legend
   end
+end
+
+Then /^the following notice should be displayed "([^\"]*)"$/ do |notice|
+  response.should have_selector :div, attribute = {:class => "notice"} do |wrapper|
+    wrapper.should contain notice
+  end
 end
\ No newline at end of file