JR: Merge from jorgej master branch

app/controllers/advanced_search_controller.rb

@@ -13,7 +13,6 @@ def index
     @page_name = "Advanced Search"
     @forms = FormSection.by_order
     @aside = 'shared/sidebar_links'
-    @highlighted_fields = []
     @user = current_user
     new_search = !params[:criteria_list]
 

app/controllers/children_controller.rb

@@ -13,7 +13,7 @@ def index
     filter_children_by params[:status], params[:order_by]
 
     respond_to do |format|
-      format.html { @highlighted_fields = FormSection.sorted_highlighted_fields }
+      format.html
       format.xml  { render :xml => @children }
       format.csv  { render_as_csv @children, "all_records_#{file_name_date_string}.csv" }
       format.json { render :json => @children }
@@ -162,7 +162,6 @@ def search
       @search = Search.new(params[:query]) 
       if @search.valid?    
         @results = Child.search(@search)
-        @highlighted_fields = FormSection.sorted_highlighted_fields
       else
         render :search
       end

app/controllers/duplicates_controller.rb

@@ -7,7 +7,6 @@ def new
     redirect_to child_filter_path("flagged") and return if @child.nil?
 
     @page_name = "Mark #{@child.name} as Duplicate"
-    @highlighted_fields = FormSection.sorted_highlighted_fields
   end
 
   def create

app/helpers/application_helper.rb

@@ -59,4 +59,5 @@ def link_with_confirm(link_to, anchor, link_options = {})
     link_to link_to, anchor, link_options
   end
 
+
 end

app/helpers/form_section_helper.rb

@@ -1,2 +1,5 @@
 module FormSectionHelper
+  def sorted_highlighted_fields
+    FormSection.sorted_highlighted_fields
+  end
 end

app/models/searchable.rb

@@ -22,8 +22,11 @@ def index_record
         begin
           Child.build_solar_schema
           Sunspot.index!(self)
-        rescue
+        rescue Exception => e
           puts "***Problem indexing record for searching, is SOLR running?"
+          p e
+          puts e.message
+          puts e.backtrace.inspect
         end
         true
       end

app/views/children/_summary_row.html.erb

@@ -24,7 +24,7 @@
 		</p>
   <div class="details">
     <dl class="basic">
-      <% @highlighted_fields.each do |relevant_field| %>
+      <% sorted_highlighted_fields.each do |relevant_field| %>
         <dt><%= relevant_field[:display_name] %>:</dt>
         <dd><%= summary_row[relevant_field[:name]] %></dd>
       <% end %>

config/cucumber.yml

@@ -1,4 +1,4 @@
-default: --format progress features --strict --tags ~@wip
+default: --format pretty features --strict --tags ~@wip
 headless: --format progress capybara_features --strict --tags ~@wip --tags ~@javascript
 browser: --format progress capybara_features --strict --tags @javascript --tags ~@wip
 browser_wip: --tags @javascript --tags @wip:3 --wip capybara_features

spec/controllers/children_controller_spec.rb

@@ -212,16 +212,6 @@ def mock_child(stubs={})
 
   describe "GET search" do
 
-    it "assigns the highlighted fields as @highlighted_fields on success" do
-      fields = [ mock_model(Field, { :name => "field_1", :display_name => "field display 1" }).as_null_object, 
-                 mock_model(Field, { :name => "field_2", :display_name => "field display 2" }).as_null_object ]
-      FormSection.stub!(:sorted_highlighted_fields).and_return(fields)     
-      search = mock("search", :query => 'the child name', :valid? => true)
-      Search.stub!(:new).and_return(search)
-      get :search, :format => 'html', :query => 'the child name'
-      assigns[:highlighted_fields].should == fields
-    end
-
     it "should not render error by default" do
       get(:search, :format => 'html')
       assigns[:search].should be_nil

spec/controllers/duplicates_controller_spec.rb

@@ -12,7 +12,6 @@
         Child.stub!(:get).with("1234").and_return(@child)
 
         @form_sections = [ mock_model(FormSection), mock_model(FormSection), mock_model(FormSection) ]
-        FormSection.stub!(:sorted_highlighted_fields).and_return(@form_sections)
 
         get :new, :child_id => "1234"
       end
@@ -28,10 +27,6 @@
       it "should assign the page name" do
         assigns[:page_name].should == "Mark #{@child.name} as Duplicate"
       end
-
-      it "should fetch and assign highlighted fields" do
-        assigns[:highlighted_fields].should equal(@form_sections)
-      end
     end
 
     context "An non-admin user" do
@@ -83,4 +78,4 @@
       end
     end
   end  
-end
+end

spec/helpers/application_helper_spec.rb

@@ -20,6 +20,5 @@
       url.should include('.csv')
       url.should_not include('.pdf')
     end
-
   end
 end

spec/views/child/search.html.erb_spec.rb

@@ -11,10 +11,12 @@
       @user.stub!(:time_zone).and_return TZInfo::Timezone.get("UTC")
       @user.stub!(:localize_date).and_return("some date")
       @results = Array.new(4){ |i| random_child_summary("some_id_#{i}") }
-      @highlighted_fields = [ { :name => "field_2", :display_name => "field display 2" }, { :name => "field_4", :display_name => "field display 4" } ]
+      @highlighted_fields = [
+        { :name => "field_2", :display_name => "field display 2" },
+        { :name => "field_4", :display_name => "field display 4" } ]
+      FormSection.stub!(:sorted_highlighted_fields).and_return @highlighted_fields
       assigns[:user] = @user
       assigns[:results] = @results
-      assigns[:highlighted_fields] = @highlighted_fields
     end
 
     it "should render items for each record in the results" do