From 7c46f3a6bbdbf5e3b442896c0c84302eb55818ac Mon Sep 17 00:00:00 2001
From: Rikesh Dhokia <rikeshdhokia@gmail.com>
Date: Wed, 18 May 2011 15:51:39 +1000
Subject: [PATCH 1/9] #622: rikesh - implement advanced search by created by
 field

---
 Gemfile                                       |  1 +
 Gemfile.lock                                  | 11 +++-
 app/controllers/advanced_search_controller.rb | 26 +++++---
 app/models/child.rb                           |  8 ++-
 app/models/search_criteria.rb                 |  6 +-
 app/views/advanced_search/index.html.erb      | 10 +++-
 config/routes.rb                              |  2 +-
 features/advanced_search.feature              | 22 +++++++
 features/step_definitions/web_steps.rb        |  1 -
 features/support/paths.rb                     | 26 ++++----
 public/javascripts/advanced_search.js         |  5 ++
 .../advanced_search_controller_spec.rb        | 60 ++++++++++++++++---
 spec/models/child_spec.rb                     | 24 +++++++-
 spec/models/search_criteria_spec.rb           | 10 +++-
 14 files changed, 173 insertions(+), 39 deletions(-)
 create mode 100644 features/advanced_search.feature

diff --git a/Gemfile b/Gemfile
index b666f5d85..53b168282 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,6 +21,7 @@ group :cucumber do
   gem 'cucumber',         '0.9.4'
   gem 'cucumber-rails',   '0.3.2'
   gem 'hpricot',          '0.8.2'
+  gem 'launchy',          '0.4.0'
 end
 
 group :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 7e6f82610..9c0927d5f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,6 +13,7 @@ GEM
       activesupport (= 2.3.11)
     activesupport (2.3.11)
     builder (2.1.2)
+    configuration (1.2.0)
     couchrest (0.34)
       mime-types (>= 1.15)
       rest-client (>= 0.5)
@@ -37,6 +38,9 @@ GEM
     hpricot (0.8.2)
     json (1.4.6)
     json_pure (1.4.6)
+    launchy (0.4.0)
+      configuration (>= 0.0.5)
+      rake (>= 0.8.1)
     mime-types (1.16)
     mini_magick (1.3.2)
       subexec (~> 0.0.4)
@@ -44,9 +48,9 @@ GEM
     pdf-reader (0.8.6)
       Ascii85 (>= 0.9)
     prawn (0.8.4)
-      prawn-core (>= 0.8.4, < 0.9)
-      prawn-layout (>= 0.8.4, < 0.9)
-      prawn-security (>= 0.8.4, < 0.9)
+      prawn-core (< 0.9, >= 0.8.4)
+      prawn-layout (< 0.9, >= 0.8.4)
+      prawn-security (< 0.9, >= 0.8.4)
     prawn-core (0.8.4)
     prawn-layout (0.8.4)
     prawn-security (0.8.4)
@@ -94,6 +98,7 @@ DEPENDENCIES
   hpricot (= 0.8.2)
   json (= 1.4.6)
   json_pure (= 1.4.6)
+  launchy (= 0.4.0)
   mime-types (= 1.16)
   mini_magick (= 1.3.2)
   pdf-reader (= 0.8.6)
diff --git a/app/controllers/advanced_search_controller.rb b/app/controllers/advanced_search_controller.rb
index ab6b4a76f..e3ea36129 100644
--- a/app/controllers/advanced_search_controller.rb
+++ b/app/controllers/advanced_search_controller.rb
@@ -1,16 +1,28 @@
 class AdvancedSearchController < ApplicationController
 
-  def index 
+  def index
+    puts params[:criteria_list]
     @forms = FormSection.all
     @aside = 'shared/sidebar_links'
-    
-    if params[:criteria_list]
-      @criteria_list = SearchCriteria.build_from_params params[:criteria_list]      
-      @results = SearchService.search(@criteria_list)
-    else
+    new_search = !params[:criteria_list]
+    if new_search
       @criteria_list = [SearchCriteria.new]
       @results = []
+    else
+      @criteria_list = (child_fields_selected?(params[:criteria_list]) ? SearchCriteria.build_from_params(params[:criteria_list]): [])
+      append_advanced_user_criteria(params[:created_by_value], @criteria_list)
+      @results = SearchService.search(@criteria_list)
+    end
+  end
+
+  def child_fields_selected?(criteria_list)
+     !criteria_list.first[1]["field"].blank? if !criteria_list.first[1].nil?
+  end
+
+  def append_advanced_user_criteria(value, list)
+    if (value.length > 0)
+      advanced_user_criteria = SearchCriteria.create_advanced_criteria({:field => "created_by", :value => value, :index => 12})
+      list.push(advanced_user_criteria)
     end
-    
   end
 end
\ No newline at end of file
diff --git a/app/models/child.rb b/app/models/child.rb
index 2c20debc0..970526245 100644
--- a/app/models/child.rb
+++ b/app/models/child.rb
@@ -31,13 +31,15 @@ class Child < CouchRestRails::Document
   validates_with_method :validate_has_at_least_one_field_value
   
   def self.build_solar_schema
-    fields = ["unique_identifier"]  + Field.all_text_names
-
+    fields = build_fields_for_solar
     Sunspot.setup(Child) do
       text *fields
     end
   end
- 
+
+  def self.build_fields_for_solar
+    ["unique_identifier", "created_by"] +  Field.all_text_names
+  end
 
   def validate_has_at_least_one_field_value
     return true if FormSection.all_enabled_child_fields.any? { |field| is_filled_in? field }
diff --git a/app/models/search_criteria.rb b/app/models/search_criteria.rb
index 72fd9ba08..e94f366ed 100644
--- a/app/models/search_criteria.rb
+++ b/app/models/search_criteria.rb
@@ -8,6 +8,10 @@ def initialize(params = {})
     @field = params[:field] || ""
     @value = params[:value] || ""
   end
+
+  def self.create_advanced_criteria(criteria)
+    SearchCriteria.new(:field => criteria[:field], :value => criteria[:value], :join => "AND", :index => criteria[:index].to_s)
+  end
   
   def self.build_from_params(criteria_list)
     text_fields =  FormSection.all.map{ |form| form.all_text_fields }.flatten
@@ -52,7 +56,7 @@ def self.build_joins(list, lucene_query)
     end
   end
   
-  
+
   
   
 end
\ No newline at end of file
diff --git a/app/views/advanced_search/index.html.erb b/app/views/advanced_search/index.html.erb
index c81ba1d60..2a647ce0b 100644
--- a/app/views/advanced_search/index.html.erb
+++ b/app/views/advanced_search/index.html.erb
@@ -34,9 +34,6 @@
           <% end %>
       </div>
     </div>
-
-    
-    
   
     <script id="criteria_template" type="text/x-jquery-tmpl">      
       <p>
@@ -63,6 +60,13 @@
     <p style='clear:both'>
       <a class='add-criteria'>+ add more search options</a>
     </p>
+
+    <hr>
+
+    <%= check_box_tag(:created_by) %>
+    <%= label_tag(:created_by_label, "Created by:") %>
+    <%= text_field_tag(:created_by_value) %>
+
   </form>      
 </div>
 
diff --git a/config/routes.rb b/config/routes.rb
index f36e74131..748f43989 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -48,7 +48,7 @@
     
   map.published_form_sections '/published_form_sections', :controller => 'publish_form_section', :action => 'form_sections'
   
-  map.resources :advanced_search
+  map.resources :advanced_search, :only => [:index]
 
   map.resources :form_section
 
diff --git a/features/advanced_search.feature b/features/advanced_search.feature
new file mode 100644
index 000000000..215f9e8cc
--- /dev/null
+++ b/features/advanced_search.feature
@@ -0,0 +1,22 @@
+Feature: So that I can find a child that has been entered in to RapidFTR
+  As a user of the website
+  I want to use the advanced search criteria to find all relevant results
+
+  Background:
+    Given I am logged in
+    And I am on child advanced search page
+
+  Scenario: Searching for children by the user who entered the details
+
+    Given the following children exist in the system:
+      | name   | created_by   |
+      | Willis | aid_worker_1 |
+      | Will   | aid_worker_2 |
+
+#    When I check "created_by"
+    And I fill in "aid_worker_1" for "created_by_value"
+    And I press "Search"
+
+    Then I should be on the child advanced search results page
+
+#    And I should see "Willis" in the search results
diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
index 921ac8373..dee99f425 100644
--- a/features/step_definitions/web_steps.rb
+++ b/features/step_definitions/web_steps.rb
@@ -278,7 +278,6 @@
   save_and_open_page
 end
 
-
 Then /^I should be in the (.*?) page$/ do |page|
   pending
 end
diff --git a/features/support/paths.rb b/features/support/paths.rb
index dfb85e34e..4d01352b3 100644
--- a/features/support/paths.rb
+++ b/features/support/paths.rb
@@ -40,13 +40,13 @@ def path_to(page_name, options = {})
         child = Summary.by_name(:key => child_name)
         raise "no child named '#{child_name}'" if child.nil?
         child_path( child, options )
-        
+
       when /child record page for "(.+)"/
         child_name = $1
         child = Summary.by_name(:key => child_name)
         raise "no child named '#{child_name}'" if child.nil?
         child_path( child, options )
-        
+
       when /change log page for "(.+)"/
         child_name = $1
         child = Summary.by_name(:key => child_name)
@@ -65,27 +65,33 @@ def path_to(page_name, options = {})
 
       when /child search page/
         search_children_path(options)
-        
+
+      when /child advanced search page/
+        advanced_search_index_path(options)
+
       when /login page/
         login_path(options)
-        
+
       when /logout page/
         logout_path(options)
-        
+
       when /child search results page/
         search_children_path(options)
-        
+
+      when /child advanced search results page/
+        advanced_search_index_path(options)
+
       when /create form section page/
         new_formsection_path(options)
-      
+
       when /edit form section page for "(.+)"$/
         edit_form_section_path(:id => $1)
-        
+
       when /edit field page for "(.+)" on "(.+)" form$/
         edit_formsection_field_path(:formsection_id => $2, :id => $1)
-          
+
       when /form section page/
-        formsections_path(options) 
+        formsections_path(options)
 
       when /choose field type page/
         arbitrary_form_section = FormSection.new
diff --git a/public/javascripts/advanced_search.js b/public/javascripts/advanced_search.js
index 2d403bf91..f51f472ad 100644
--- a/public/javascripts/advanced_search.js
+++ b/public/javascripts/advanced_search.js
@@ -1,5 +1,6 @@
 (function($){
 	$.fn.advancedSearch = function(options){
+
 		var element = $(this); 
 		var self = this;
 		
@@ -91,6 +92,10 @@
 		
 		var validate = function(){
 			var result = "";
+
+            if ($('#created_by_value').val() != '') {
+                return result;
+            }
 			$('.criteria-list .criteria-field').each(function(){
 				if($(this).val() == "") { result = 'Please select a valid field name.'; }
 			});
diff --git a/spec/controllers/advanced_search_controller_spec.rb b/spec/controllers/advanced_search_controller_spec.rb
index edf7104bd..d6eb9f80d 100644
--- a/spec/controllers/advanced_search_controller_spec.rb
+++ b/spec/controllers/advanced_search_controller_spec.rb
@@ -4,13 +4,30 @@
   before do
     fake_login
   end
+
+  it "performs a search using the parameters passed to it" do
+     search = mock("search_criteria")
+     SearchCriteria.stub!(:build_from_params).and_return([search])
+
+     fake_results = [:fake_child,:fake_child]
+     SearchService.should_receive(:search).with([search]).and_return(fake_results)
+     get :index, :criteria_list => {"0"=>{"field"=>"name_of_child", "value"=>"joe joe", "index"=>"0"}}, :created_by_value => ""
+     assigns[:results].should == fake_results
+  end
+
+
+  it "should construct empty criteria objects for new search" do
+    SearchCriteria.stub(:new).and_return("empty_criteria")
+    get :index
+    assigns[:criteria_list].should == ["empty_criteria"]
+  end
   
-  it "should construct criteria objects" do
+  it "should construct criteria objects for advanced child search " do
     SearchService.stub(:search).and_return([])
-    SearchCriteria.stub(:build_from_params).and_return("criteria_list")
-    
-    get :index, :criteria_list => "something"
-    assigns[:criteria_list].should == "criteria_list"
+    SearchCriteria.stub(:build_from_params).and_return(["criteria_list"])
+
+    get :index, :criteria_list => {"0"=>{"field"=>"name_of_child", "value"=>"joe joe", "index"=>"0"}}, :created_by_value => ""
+    assigns[:criteria_list].should == ["criteria_list"]
     # first_criteria = assigns[:criteria_list].first
     
     
@@ -24,6 +41,26 @@
     # first_criteria.index.should == "1"
     
   end
+
+  it "should append advanced user criteria" do
+    SearchCriteria.stub(:build_from_params).and_return(["criteria_list"])
+    SearchCriteria.stub(:create_advanced_criteria).and_return("advanced_criteria")
+    SearchService.stub(:search).and_return([])
+
+    get :index, :criteria_list => {"0"=>{"field"=>"name_of_child", "value"=>"joe joe", "index"=>"0"}}, :created_by_value => "johnny_user"
+
+    assigns[:criteria_list].should == ["criteria_list", "advanced_criteria"]
+  end
+
+  it "should construct criteria list for only advanced user criteria" do
+    SearchCriteria.stub(:create_advanced_criteria).and_return("advanced_user_details")
+    SearchService.stub(:search).and_return([])
+
+    get :index, :criteria_list => {"0"=>{"field"=>"", "value"=>"", "index"=>"0"}},
+                :created_by_value => "johnny_user"
+
+    assigns[:criteria_list].should == ["advanced_user_details"]
+  end
   
   it "should order by criteria index" do
     SearchService.stub(:search).and_return([])
@@ -50,7 +87,14 @@
     # assigns[:criteria_list][1].field.should == "name"
     # assigns[:criteria_list][2].field.should == "origin"
   end
-  
-  
-  
+
+  it "should say child fields have been selected" do
+    controller = AdvancedSearchController.new
+    controller.child_fields_selected?({"0"=>{"field"=>"name_of_child", "value"=>"joe joe", "index"=>"0"}}).should == true
+  end
+
+  it "should say child fields have NOT been selected" do
+    controller = AdvancedSearchController.new
+    controller.child_fields_selected?({"0"=>{"field"=>"", "value"=>"", "index"=>"0"}}).should == false
+  end
 end
\ No newline at end of file
diff --git a/spec/models/child_spec.rb b/spec/models/child_spec.rb
index e3b148444..df767165a 100644
--- a/spec/models/child_spec.rb
+++ b/spec/models/child_spec.rb
@@ -4,7 +4,29 @@
 describe Child do
 
 
+  describe 'build solar schema' do
+      it "should build with advanced search fields" do
+        Child.build_fields_for_solar.should == ["unique_identifier", "created_by"]
+      end
 
+      it "fields build with all fields in form sections" do
+        form = FormSection.new(:name => "test_form")
+        form.fields << Field.new(:name => "name", :type => Field::TEXT_FIELD, :display_name => "name")
+        form.save!
+
+        Child.build_fields_for_solar.should include("name")
+
+        FormSection.all.each{ |form| form.destroy }
+
+      end
+
+      it "should call Sunspot with all fields" do
+        Sunspot.should_receive(:setup)
+        Child.should_receive(:build_fields_for_solar)
+        Child.build_solar_schema
+      end
+
+  end
  
   describe ".search" do
     before :each do
@@ -754,6 +776,6 @@
   
   def create_child(name)
     Child.create("name" => name, "last_known_location" => "new york")
-  end 
+  end
 
 end
diff --git a/spec/models/search_criteria_spec.rb b/spec/models/search_criteria_spec.rb
index 11d86c93f..1db9b8086 100644
--- a/spec/models/search_criteria_spec.rb
+++ b/spec/models/search_criteria_spec.rb
@@ -13,10 +13,18 @@
   after(:all) do
     FormSection.all.each{ |form| form.destroy }
   end
+
+  it "should construct advanced search parameters to criteria objects" do
+    search_criteria = SearchCriteria.create_advanced_criteria({:field => "created_by", :value => "johnny01", :index => 123})
+    search_criteria.field.should == "created_by"
+    search_criteria.value.should == "johnny01"
+    search_criteria.join.should == "AND"
+    search_criteria.index.should == '123'
+  end
   
   it "should construct criteria objects" do    
     criteria_list = SearchCriteria.build_from_params("1" => {:field => "name", :value => "kevin", :join => "AND", :display_name => "name" } )
-    
+
     #assigns[:criteria_list].length.should == 1
     first_criteria = criteria_list.first
     first_criteria.field.should == "name"

From 5664497e96a90f9fad1d545b6fd51a9e4b5a0ab4 Mon Sep 17 00:00:00 2001
From: Rikesh Dhokia <rikeshdhokia@gmail.com>
Date: Wed, 18 May 2011 16:20:46 +1000
Subject: [PATCH 2/9] #622: rikesh - merge with master

---
 spec/controllers/advanced_search_controller_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/controllers/advanced_search_controller_spec.rb b/spec/controllers/advanced_search_controller_spec.rb
index 711f0d4ad..e5c05c07c 100644
--- a/spec/controllers/advanced_search_controller_spec.rb
+++ b/spec/controllers/advanced_search_controller_spec.rb
@@ -27,7 +27,7 @@
     SearchCriteria.stub(:build_from_params).and_return(["criteria_list"])
     
     get :index, :criteria_list => {"0"=>{"field"=>"name_of_child", "value"=>"joe joe", "index"=>"0"}}, :created_by_value => ""
-    assigns[:criteria_list].should == "criteria_list"
+    assigns[:criteria_list].should == ["criteria_list"]
 
   end
 

From 14a34bd7bbe83360a74b3cae2c5cd58c5e128124 Mon Sep 17 00:00:00 2001
From: Rikesh Dhokia <rikeshdhokia@gmail.com>
Date: Thu, 19 May 2011 16:56:15 +1000
Subject: [PATCH 3/9] #622: rikesh - advanced search page, toggle created by
 input field based on checkbox

---
 app/views/advanced_search/index.html.erb |  2 +-
 public/javascripts/advanced_search.js    | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/app/views/advanced_search/index.html.erb b/app/views/advanced_search/index.html.erb
index d1afde6df..074c0b979 100644
--- a/app/views/advanced_search/index.html.erb
+++ b/app/views/advanced_search/index.html.erb
@@ -65,7 +65,7 @@
 
     <%= check_box_tag(:created_by) %>
     <%= label_tag(:created_by_label, "Created by:") %>
-    <%= text_field_tag(:created_by_value) %>
+    <%= text_field_tag(:created_by_value, nil, :disabled => true) %>
 
   </form>      
 </div>
diff --git a/public/javascripts/advanced_search.js b/public/javascripts/advanced_search.js
index f51f472ad..2c50300a4 100644
--- a/public/javascripts/advanced_search.js
+++ b/public/javascripts/advanced_search.js
@@ -89,11 +89,27 @@
 		menu.find(".close-link").click(function(){
 			menu.hide();
 		});
-		
+
+        function enableInputByCheckbox(checkbox, inputElement) {
+            if (checkbox.is(':checked')) {
+                inputElement.removeAttr('disabled');
+            } else {
+                inputElement.attr('disabled', true);
+            }
+        }
+
+        $('#created_by').bind('click', function() {
+            enableInputByCheckbox($(this), $('#created_by_value'));
+        });
+
+        function createdByIsValid() {
+            return ($('#created_by').is(':checked')) && ($('#created_by_value').val() != '');
+        }
+
 		var validate = function(){
 			var result = "";
 
-            if ($('#created_by_value').val() != '') {
+            if (createdByIsValid()) {
                 return result;
             }
 			$('.criteria-list .criteria-field').each(function(){

From ae84169c7543d53f004a6955c9dd04affa7b9702 Mon Sep 17 00:00:00 2001
From: Rikesh Dhokia <rikeshdhokia@gmail.com>
Date: Tue, 24 May 2011 18:53:29 +1000
Subject: [PATCH 4/9] #622: rikesh - seperate out new search action in
 AdvancedSearchController so :index becomes easier to read

---
 app/controllers/advanced_search_controller.rb       | 9 +++++++++
 app/helpers/application_helper.rb                   | 2 +-
 config/routes.rb                                    | 2 +-
 features/advanced_search.feature                    | 3 ++-
 public/javascripts/advanced_search.js               | 4 ++--
 spec/controllers/advanced_search_controller_spec.rb | 3 ++-
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/controllers/advanced_search_controller.rb b/app/controllers/advanced_search_controller.rb
index 987aaf198..9aabdb28b 100644
--- a/app/controllers/advanced_search_controller.rb
+++ b/app/controllers/advanced_search_controller.rb
@@ -1,5 +1,14 @@
 class AdvancedSearchController < ApplicationController
 
+  def new
+    @forms = FormSection.by_order
+    @aside = 'shared/sidebar_links'
+
+    @criteria_list = [SearchCriteria.new]
+    @results = []
+    render :index
+  end
+
   def index
     @forms = FormSection.by_order
     @aside = 'shared/sidebar_links'
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 470722354..43c2c32a0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -44,7 +44,7 @@ def discard_button(path)
   def show_sidebar_links
     sidebar_links = {"View All Children" => children_path, 
                      "Search" => search_children_path, 
-                     "Advanced Search" => advanced_search_index_path}
+                     "Advanced Search" => new_advanced_search_path}
     sidebar_links.select do |_, link|
       !current_page?(link)
     end
diff --git a/config/routes.rb b/config/routes.rb
index 748f43989..916c4b391 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -48,7 +48,7 @@
     
   map.published_form_sections '/published_form_sections', :controller => 'publish_form_section', :action => 'form_sections'
   
-  map.resources :advanced_search, :only => [:index]
+  map.resources :advanced_search, :only => [:new, :index]
 
   map.resources :form_section
 
diff --git a/features/advanced_search.feature b/features/advanced_search.feature
index 215f9e8cc..ac14e592d 100644
--- a/features/advanced_search.feature
+++ b/features/advanced_search.feature
@@ -1,3 +1,4 @@
+@wip
 Feature: So that I can find a child that has been entered in to RapidFTR
   As a user of the website
   I want to use the advanced search criteria to find all relevant results
@@ -13,7 +14,7 @@ Feature: So that I can find a child that has been entered in to RapidFTR
       | Willis | aid_worker_1 |
       | Will   | aid_worker_2 |
 
-#    When I check "created_by"
+    When I check "created_by"
     And I fill in "aid_worker_1" for "created_by_value"
     And I press "Search"
 
diff --git a/public/javascripts/advanced_search.js b/public/javascripts/advanced_search.js
index 2c50300a4..238eddd51 100644
--- a/public/javascripts/advanced_search.js
+++ b/public/javascripts/advanced_search.js
@@ -90,7 +90,7 @@
 			menu.hide();
 		});
 
-        function enableInputByCheckbox(checkbox, inputElement) {
+        var enableInputByCheckbox = function(checkbox, inputElement) {
             if (checkbox.is(':checked')) {
                 inputElement.removeAttr('disabled');
             } else {
@@ -102,7 +102,7 @@
             enableInputByCheckbox($(this), $('#created_by_value'));
         });
 
-        function createdByIsValid() {
+        var createdByIsValid = function() {
             return ($('#created_by').is(':checked')) && ($('#created_by_value').val() != '');
         }
 
diff --git a/spec/controllers/advanced_search_controller_spec.rb b/spec/controllers/advanced_search_controller_spec.rb
index e5c05c07c..368b1ae18 100644
--- a/spec/controllers/advanced_search_controller_spec.rb
+++ b/spec/controllers/advanced_search_controller_spec.rb
@@ -18,7 +18,8 @@
 
   it "should construct empty criteria objects for new search" do
     SearchCriteria.stub(:new).and_return("empty_criteria")
-    get :index
+    get :new
+    response.should render_template('advanced_search/index.html.erb')
     assigns[:criteria_list].should == ["empty_criteria"]
   end
   

From f8de784356986b4a21c346da0bef54960fa763bc Mon Sep 17 00:00:00 2001
From: Rikesh Dhokia <rikeshdhokia@gmail.com>
Date: Sun, 26 Jun 2011 16:22:44 +1000
Subject: [PATCH 5/9] rikesh: adding capybara support so we can increase out
 acceptance level testing coverage

---
 Gemfile                                       |   1 +
 Gemfile.lock                                  |  19 ++
 capybara_features/advanced_search.feature     |  24 +++
 capybara_features/capybara.feature            |   9 +
 .../step_definitions/database_steps.rb        |  52 +++++
 .../step_definitions/web_steps.rb             | 201 ++++++++++++++++++
 capybara_features/support/env.rb              |  54 +++++
 capybara_features/support/hooks.rb            |  10 +
 capybara_features/support/paths.rb            | 137 ++++++++++++
 capybara_features/support/reset_couchdb.rb    |  11 +
 config/cucumber.yml                           |   1 +
 lib/tasks/cucumber.rake                       |  16 +-
 12 files changed, 530 insertions(+), 5 deletions(-)
 create mode 100644 capybara_features/advanced_search.feature
 create mode 100644 capybara_features/capybara.feature
 create mode 100644 capybara_features/step_definitions/database_steps.rb
 create mode 100644 capybara_features/step_definitions/web_steps.rb
 create mode 100644 capybara_features/support/env.rb
 create mode 100644 capybara_features/support/hooks.rb
 create mode 100644 capybara_features/support/paths.rb
 create mode 100644 capybara_features/support/reset_couchdb.rb

diff --git a/Gemfile b/Gemfile
index 138d4137e..ef8296216 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,5 +28,6 @@ group :test do
   gem 'rspec',            '1.3.2'
   gem 'rspec-rails',      '1.3.4'
   gem 'webrat',           '0.7.1'
+  gem 'capybara',         '1.0.0'
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 7499dc0fd..41b588411 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -13,6 +13,15 @@ GEM
       activesupport (= 2.3.11)
     activesupport (2.3.11)
     builder (2.1.2)
+    capybara (1.0.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 0.2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
     configuration (1.2.0)
     couchrest (0.34)
       mime-types (>= 1.15)
@@ -29,6 +38,7 @@ GEM
     diff-lcs (1.1.2)
     escape (0.0.4)
     fastercsv (1.5.3)
+    ffi (1.0.9)
     gherkin (2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
@@ -73,6 +83,12 @@ GEM
     rspec-rails (1.3.4)
       rack (>= 1.0.0)
       rspec (~> 1.3.1)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
+      ffi (>= 1.0.7)
+      json_pure
+      rubyzip
     subexec (0.0.4)
     sunspot (1.1.0)
       escape (= 0.0.4)
@@ -84,11 +100,14 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  capybara (= 1.0.0)
   couchrest (= 0.34)
   cucumber (= 0.9.4)
   cucumber-rails (= 0.3.2)
diff --git a/capybara_features/advanced_search.feature b/capybara_features/advanced_search.feature
new file mode 100644
index 000000000..bc48044e3
--- /dev/null
+++ b/capybara_features/advanced_search.feature
@@ -0,0 +1,24 @@
+@wip
+Feature: So that I can find a child that has been entered in to RapidFTR
+  As a user of the website
+  I want to use the advanced search criteria to find all relevant results
+
+  Background:
+    Given I am logged in
+    And I am on child advanced search page
+
+  @javascript
+  Scenario: Searching for children by the user who entered the details
+
+    Given the following children exist in the system:
+      | name   | created_by   |
+      | Willis | aid_worker_1 |
+      | Will   | aid_worker_2 |
+
+    When I check "created_by"
+    And I fill in "aid_worker_1" for "created_by_value"
+    And I press "Search"
+
+    Then I should be on the child advanced search results page
+
+#    And I should see "Willis" in the search results
diff --git a/capybara_features/capybara.feature b/capybara_features/capybara.feature
new file mode 100644
index 000000000..3a8a1aeb4
--- /dev/null
+++ b/capybara_features/capybara.feature
@@ -0,0 +1,9 @@
+@javascript
+Feature: Test capybara is configured correctly
+
+  Scenario: Log into RapidFTR
+    Given a user "rapidftr" with a password "rapidftr"
+    Given I am on the login page
+    When I fill in "rapidftr" for "user_name"
+    And I fill in "rapidftr" for "password"
+    And I press "Log in"
diff --git a/capybara_features/step_definitions/database_steps.rb b/capybara_features/step_definitions/database_steps.rb
new file mode 100644
index 000000000..d5e3e23a5
--- /dev/null
+++ b/capybara_features/step_definitions/database_steps.rb
@@ -0,0 +1,52 @@
+Given /^an? (user|admin) "([^\"]*)" with(?: a)? password "([^\"]*)"$/ do |user_type, username, password|
+  user_type = user_type == 'user' ? 'User' : 'Administrator'
+  @user = User.new(
+    :user_name=>username, 
+    :password=>password, 
+    :password_confirmation=>password, 
+    :user_type=> user_type, 
+    :full_name=>username, 
+    :email=>"#{username}@test.com")
+  @user.save!
+end
+
+Given /^an? (user|admin) "([^"]+)"$/ do |user_type, user_name|
+  Given %(a #{user_type} "#{user_name}" with password "123")
+end
+
+Given /^I am logged in as "(.+)"/ do |user_name|
+  @session = Session.for_user(User.find_by_user_name(user_name), nil)
+  @session.save!
+  @session.put_in_cookie cookies
+end
+
+Given /^I have an expired session/ do
+  @session.destroy
+end
+
+Given /^user "(.+)" is disabled$/ do |username|
+  user = User.find_by_user_name(username)
+  user.disabled = true
+  user.save!
+end
+
+Then /^user "(.+)" should be disabled$/ do |username|
+  User.find_by_user_name(username).should be_disabled
+end
+
+Then /^user "(.+)" should not be disabled$/ do |username|
+  User.find_by_user_name(username).should_not be_disabled
+end
+
+Given /^the following admin contact info:$/ do |table|
+  contact_info = table.hashes.inject({}) do |result, current|
+    result[current["key"]] = current["value"]
+    result
+  end
+  contact_info[:id] = "administrator"
+  ContactInformation.create contact_info
+end
+
+
+
+
diff --git a/capybara_features/step_definitions/web_steps.rb b/capybara_features/step_definitions/web_steps.rb
new file mode 100644
index 000000000..060bef87e
--- /dev/null
+++ b/capybara_features/step_definitions/web_steps.rb
@@ -0,0 +1,201 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+require 'uri'
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+
+module WithinHelpers
+  def with_scope(locator)
+    locator ? within(locator) { yield } : yield
+  end
+end
+World(WithinHelpers)
+
+Given /^(?:|I )am on (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )go to (.+)$/ do |page_name|
+  visit path_to(page_name)
+end
+
+When /^(?:|I )press "([^\"]*)"(?: within "([^\"]*)")?$/ do |button, selector|
+  with_scope(selector) do
+    click_button(button)
+  end
+end
+
+When /^(?:|I )follow "([^\"]*)"(?: within "([^\"]*)")?$/ do |link, selector|
+  with_scope(selector) do
+    click_link(link)
+  end
+end
+
+When /^(?:|I )fill in "([^\"]*)" with "([^\"]*)"(?: within "([^\"]*)")?$/ do |field, value, selector|
+  with_scope(selector) do
+    fill_in(field, :with => value)
+  end
+end
+
+When /^(?:|I )fill in "([^\"]*)" for "([^\"]*)"(?: within "([^\"]*)")?$/ do |value, field, selector|
+  with_scope(selector) do
+    fill_in(field, :with => value)
+  end
+end
+
+# Use this to fill in an entire form with data from a table. Example:
+#
+#   When I fill in the following:
+#     | Account Number | 5002       |
+#     | Expiry date    | 2009-11-01 |
+#     | Note           | Nice guy   |
+#     | Wants Email?   |            |
+#
+# TODO: Add support for checkbox, select og option
+# based on naming conventions.
+#
+When /^(?:|I )fill in the following(?: within "([^\"]*)")?:$/ do |selector, fields|
+  with_scope(selector) do
+    fields.rows_hash.each do |name, value|
+      When %{I fill in "#{name}" with "#{value}"}
+    end
+  end
+end
+
+When /^(?:|I )select "([^\"]*)" from "([^\"]*)"(?: within "([^\"]*)")?$/ do |value, field, selector|
+  with_scope(selector) do
+    select(value, :from => field)
+  end
+end
+
+When /^(?:|I )check "([^\"]*)"(?: within "([^\"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    check(field)
+  end
+end
+
+When /^(?:|I )uncheck "([^\"]*)"(?: within "([^\"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    uncheck(field)
+  end
+end
+
+When /^(?:|I )choose "([^\"]*)"(?: within "([^\"]*)")?$/ do |field, selector|
+  with_scope(selector) do
+    choose(field)
+  end
+end
+
+When /^(?:|I )attach the file "([^\"]*)" to "([^\"]*)"(?: within "([^\"]*)")?$/ do |path, field, selector|
+  with_scope(selector) do
+    attach_file(field, path)
+  end
+end
+
+Then /^(?:|I )should see "([^\"]*)"(?: within "([^\"]*)")?$/ do |text, selector|
+  with_scope(selector) do
+    if defined?(Spec::Rails::Matchers)
+      page.should have_content(text)
+    else
+      assert page.has_content?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should see \/([^\/]*)\/(?: within "([^\"]*)")?$/ do |regexp, selector|
+  regexp = Regexp.new(regexp)
+  with_scope(selector) do
+    if defined?(Spec::Rails::Matchers)
+      page.should have_xpath('//*', :text => regexp)
+    else
+      assert page.has_xpath?('//*', :text => regexp)
+    end
+  end
+end
+
+Then /^(?:|I )should not see "([^\"]*)"(?: within "([^\"]*)")?$/ do |text, selector|
+  with_scope(selector) do
+    if defined?(Spec::Rails::Matchers)
+      page.should have_no_content(text)
+    else
+      assert page.has_no_content?(text)
+    end
+  end
+end
+
+Then /^(?:|I )should not see \/([^\/]*)\/(?: within "([^\"]*)")?$/ do |regexp, selector|
+  regexp = Regexp.new(regexp)
+  with_scope(selector) do
+    if defined?(Spec::Rails::Matchers)
+      page.should have_no_xpath('//*', :text => regexp)
+    else
+      assert page.has_no_xpath?('//*', :text => regexp)
+    end
+  end
+end
+
+Then /^the "([^\"]*)" field(?: within "([^\"]*)")? should contain "([^\"]*)"$/ do |field, selector, value|
+  with_scope(selector) do
+    if defined?(Spec::Rails::Matchers)
+      find_field(field).value.should =~ /#{value}/
+    else
+      assert_match(/#{value}/, field_labeled(field).value)
+    end
+  end
+end
+
+Then /^the "([^\"]*)" field(?: within "([^\"]*)")? should not contain "([^\"]*)"$/ do |field, selector, value|
+  with_scope(selector) do
+    if defined?(Spec::Rails::Matchers)
+      find_field(field).value.should_not =~ /#{value}/
+    else
+      assert_no_match(/#{value}/, find_field(field).value)
+    end
+  end
+end
+
+Then /^the "([^\"]*)" checkbox(?: within "([^\"]*)")? should be checked$/ do |label, selector|
+  with_scope(selector) do
+    if defined?(Spec::Rails::Matchers)
+      find_field(label)['checked'].should == 'checked'
+    else
+      assert_equal 'checked', field_labeled(label)['checked']
+    end
+  end
+end
+
+Then /^the "([^\"]*)" checkbox(?: within "([^\"]*)")? should not be checked$/ do |label, selector|
+  with_scope(selector) do
+    if defined?(Spec::Rails::Matchers)
+      find_field(label)['checked'].should_not == 'checked'
+    else
+      assert_not_equal 'checked', field_labeled(label)['checked']
+    end
+  end
+end
+ 
+Then /^(?:|I )should be on (.+)$/ do |page_name|
+  if defined?(Spec::Rails::Matchers)
+    URI.parse(current_url).path.should == path_to(page_name)
+  else
+    assert_equal path_to(page_name), URI.parse(current_url).path
+  end
+end
+
+Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
+  actual_params   = CGI.parse(URI.parse(current_url).query)
+  expected_params = Hash[expected_pairs.rows_hash.map{|k,v| [k,[v]]}]
+ 
+  if defined?(Spec::Rails::Matchers)
+    actual_params.should == expected_params
+  else
+    assert_equal expected_params, actual_params
+  end
+end
+
+Then /^show me the page$/ do
+  save_and_open_page
+end
diff --git a/capybara_features/support/env.rb b/capybara_features/support/env.rb
new file mode 100644
index 000000000..3060122fd
--- /dev/null
+++ b/capybara_features/support/env.rb
@@ -0,0 +1,54 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+ENV["RAILS_ENV"] ||= "cucumber"
+require File.expand_path(File.dirname(__FILE__) + '/../../config/environment')
+
+require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
+require 'cucumber/rails/rspec'
+require 'cucumber/rails/world'
+require 'cucumber/rails/active_record'
+require 'cucumber/web/tableish'
+
+require 'capybara/rails'
+require 'capybara/cucumber'
+
+require 'spec/stubs/cucumber'
+
+Capybara.run_server = true #Whether start server when testing
+Capybara.default_selector = :xpath #default selector , you can change to :css
+Capybara.default_wait_time = 2 #When we testing AJAX, we can set a default wait time
+Capybara.ignore_hidden_elements = false #Ignore hidden elements when testing, make helpful when you hide or show elements using javascript
+Capybara.javascript_driver = :selenium #default driver when you using @javascript tag
+
+# If you set this to false, any error raised from within your app will bubble 
+# up to your step definition and out to cucumber unless you catch it somewhere
+# on the way. You can make Rails rescue errors and render error pages on a
+# per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.
+#
+# If you set this to true, Rails will rescue all errors and render error
+# pages, more or less in the same way your application would behave in the
+# default production environment. It's not recommended to do this for all
+# of your scenarios, as this makes it hard to discover errors in your application.
+ActionController::Base.allow_rescue = false
+
+# If you set this to true, each scenario will run in a database transaction.
+# You can still turn off transactions on a per-scenario basis, simply tagging 
+# a feature or scenario with the @no-txn tag. If you are using Capybara,
+# tagging with @culerity or @javascript will also turn transactions off.
+#
+# If you set this to false, transactions will be off for all scenarios,
+# regardless of whether you use @no-txn or not.
+#
+# Beware that turning transactions off will leave data in your database 
+# after each scenario, which can lead to hard-to-debug failures in 
+# subsequent scenarios. If you do this, we recommend you create a Before
+# block that will explicitly put your database in a known state.
+Cucumber::Rails::World.use_transactional_fixtures = true
+
+# How to clean your database when transactions are turned off. See
+# http://github.com/bmabey/database_cleaner for more info.
+
diff --git a/capybara_features/support/hooks.rb b/capybara_features/support/hooks.rb
new file mode 100644
index 000000000..fff8c2528
--- /dev/null
+++ b/capybara_features/support/hooks.rb
@@ -0,0 +1,10 @@
+
+# Before each scenario...
+Before do
+#  CouchRestRails::Tests.setup
+end
+
+# After each scenario...
+After do
+#  CouchRestRails::Tests.teardown
+end
\ No newline at end of file
diff --git a/capybara_features/support/paths.rb b/capybara_features/support/paths.rb
new file mode 100644
index 000000000..4d01352b3
--- /dev/null
+++ b/capybara_features/support/paths.rb
@@ -0,0 +1,137 @@
+module NavigationHelpers
+  # Maps a name to a path. Used by the
+  #
+  #   When /^I go to (.+)$/ do |page_name|
+  #
+  # step definition in web_steps.rb
+  #
+  def path_to(page_name, options = {})
+
+    format = page_name[/^(?:|the )(\w+) formatted/,1]
+    options.reverse_merge!( :format => format )
+
+    case page_name
+
+      when /the home\s?page/
+        '/'
+    when /the new create_custom_field page/
+      new_create_custom_field_path
+
+    when /the new create_custom_fields.feature page/
+      new_create_custom_fields.feature_path
+
+      when /the new add_suggested_field_to_form_section page/
+        new_add_suggested_field_to_form_section_path
+
+      when /the new assign_unique_id_to_a_child page/
+        new_assign_unique_id_to_a_child_path(options)
+
+      when /add child page/
+        new_child_path(options)
+
+      when /new child page/
+        new_child_path(options)
+
+      when /children listing page/
+        children_path(options)
+
+      when /saved record page for child with name "(.+)"/
+        child_name = $1
+        child = Summary.by_name(:key => child_name)
+        raise "no child named '#{child_name}'" if child.nil?
+        child_path( child, options )
+
+      when /child record page for "(.+)"/
+        child_name = $1
+        child = Summary.by_name(:key => child_name)
+        raise "no child named '#{child_name}'" if child.nil?
+        child_path( child, options )
+
+      when /change log page for "(.+)"/
+        child_name = $1
+        child = Summary.by_name(:key => child_name)
+        raise "no child named '#{child_name}'" if child.nil?
+        child_history_path( child, options )
+
+      when /new user page/
+        new_user_path(options)
+
+      when /manage users page/
+        users_path(options)
+
+      when /edit user page for "(.+)"/
+        user = User.find_by_user_name($1)
+        edit_user_path(user, options)
+
+      when /child search page/
+        search_children_path(options)
+
+      when /child advanced search page/
+        advanced_search_index_path(options)
+
+      when /login page/
+        login_path(options)
+
+      when /logout page/
+        logout_path(options)
+
+      when /child search results page/
+        search_children_path(options)
+
+      when /child advanced search results page/
+        advanced_search_index_path(options)
+
+      when /create form section page/
+        new_formsection_path(options)
+
+      when /edit form section page for "(.+)"$/
+        edit_form_section_path(:id => $1)
+
+      when /edit field page for "(.+)" on "(.+)" form$/
+        edit_formsection_field_path(:formsection_id => $2, :id => $1)
+
+      when /form section page/
+        formsections_path(options)
+
+      when /choose field type page/
+        arbitrary_form_section = FormSection.new
+        new_formsection_field_path( arbitrary_form_section, options )
+
+      when /the edit user page for "(.+)"$/
+        user = User.by_user_name(:key => $1)
+        raise "no user named #{$1}" if user.nil?
+        edit_user_path(user)
+
+      when /new field page for "(.+)"/
+        field_type = $1
+        new_formsection_field_path(:type => field_type)
+
+      when /the edit form section page for "(.+)"/
+        form_section = $1
+        formsection_fields_path(form_section)
+
+      when /the admin page/
+        admin_path(options)
+
+      when /the edit administrator contact information page/
+        edit_contact_information_path(:administrator)
+      when /(the )?administrator contact page/
+          contact_information_path(:administrator, options)
+
+      when /all child Ids/
+        child_ids_path
+
+      # Add more mappings here.
+      # Here is an example that pulls values out of the Regexp:
+      #
+      #   when /^(.*)'s profile page$/i
+      #     user_profile_path(User.find_by_login($1))
+
+      else
+        raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
+                "Now, go and add a mapping in #{__FILE__}"
+    end
+  end
+end
+
+World(NavigationHelpers)
diff --git a/capybara_features/support/reset_couchdb.rb b/capybara_features/support/reset_couchdb.rb
new file mode 100644
index 000000000..6d8ad5116
--- /dev/null
+++ b/capybara_features/support/reset_couchdb.rb
@@ -0,0 +1,11 @@
+
+Before do
+  Session.all.each {|s| s.destroy }
+  Child.all.each {|c| c.destroy }
+  User.all.each {|u| u.destroy }
+  SuggestedField.all.each {|u| u.destroy }
+  ContactInformation.all.each {|c| c.destroy }
+  RapidFTR::FormSectionSetup.reset_definitions
+  Sunspot.remove_all!(Child)
+  Sunspot.commit
+end
diff --git a/config/cucumber.yml b/config/cucumber.yml
index b5b82b09c..03a34f214 100644
--- a/config/cucumber.yml
+++ b/config/cucumber.yml
@@ -1,2 +1,3 @@
 default: --format progress features --strict --tags ~@wip
+browser: --format progress capybara_features --strict --tags @javascript --tags ~@wip
 wip: --tags @wip:3 --wip features
diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
index ab04dc887..af7dbf972 100644
--- a/lib/tasks/cucumber.rake
+++ b/lib/tasks/cucumber.rake
@@ -14,7 +14,7 @@ begin
   require 'cucumber/rake/task'
 
   namespace :cucumber do
-    Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
+    Cucumber::Rake::Task.new({:headless => 'db:test:prepare'}, 'Run features that should pass in headless mode') do |t|
       t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'default'
@@ -26,11 +26,17 @@ begin
       t.profile = 'wip'
     end
 
-    desc 'Run all features'
-    task :all => [:ok, :wip]
+    Cucumber::Rake::Task.new({:browser => 'db:test:prepare'}, 'Run all features that should pass in a browser') do |t|
+      t.binary = vendored_cucumber_bin
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'browser'
+    end
+
+    desc 'Run all features in headless and browser modes'
+    task :all => [:headless, :browser]
   end
-  desc 'Alias for cucumber:ok'
-  task :cucumber => 'cucumber:ok'
+  desc 'Alias for cucumber:headless and cucumber:browser'
+  task :cucumber => 'cucumber:all'
 
   task :default => :cucumber
 

From 8cb3e542dc1975cda158448ac4a3158b40ae710b Mon Sep 17 00:00:00 2001
From: Rikesh Dhokia <rikeshdhokia@gmail.com>
Date: Sun, 26 Jun 2011 16:48:44 +1000
Subject: [PATCH 6/9] rikesh: rename wip cucumber task to headless_wip

---
 lib/tasks/cucumber.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
index af7dbf972..932a35016 100644
--- a/lib/tasks/cucumber.rake
+++ b/lib/tasks/cucumber.rake
@@ -20,7 +20,7 @@ begin
       t.profile = 'default'
     end
 
-    Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
+    Cucumber::Rake::Task.new({:headless_wip => 'db:test:prepare'}, 'Run features that are being worked on in headless mode') do |t|
       t.binary = vendored_cucumber_bin
       t.fork = true # You may get faster startup if you set this to false
       t.profile = 'wip'

From c53cd3c79d37051864283b3fd28393234c0aa8be Mon Sep 17 00:00:00 2001
From: Rikesh Dhokia <rikeshdhokia@gmail.com>
Date: Sun, 26 Jun 2011 18:09:30 +1000
Subject: [PATCH 7/9] #622 rikesh - moved feature into capybara_features in
 previous merge

---
 features/advanced_search.feature | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 features/advanced_search.feature

diff --git a/features/advanced_search.feature b/features/advanced_search.feature
deleted file mode 100644
index ac14e592d..000000000
--- a/features/advanced_search.feature
+++ /dev/null
@@ -1,23 +0,0 @@
-@wip
-Feature: So that I can find a child that has been entered in to RapidFTR
-  As a user of the website
-  I want to use the advanced search criteria to find all relevant results
-
-  Background:
-    Given I am logged in
-    And I am on child advanced search page
-
-  Scenario: Searching for children by the user who entered the details
-
-    Given the following children exist in the system:
-      | name   | created_by   |
-      | Willis | aid_worker_1 |
-      | Will   | aid_worker_2 |
-
-    When I check "created_by"
-    And I fill in "aid_worker_1" for "created_by_value"
-    And I press "Search"
-
-    Then I should be on the child advanced search results page
-
-#    And I should see "Willis" in the search results

From b1684ccc4608fd3da68860023f8433cb37b3aa7e Mon Sep 17 00:00:00 2001
From: Rikesh Dhokia <rikeshdhokia@gmail.com>
Date: Thu, 30 Jun 2011 16:04:26 +1000
Subject: [PATCH 8/9] #622 rikesh: implement advanced searching by user who
 created the child record

---
 app/models/search_criteria.rb                 |  3 -
 app/views/advanced_search/index.html.erb      |  2 +-
 capybara_features/advanced_search.feature     | 26 ++++----
 .../step_definitions/children_setup_steps.rb  | 18 +++++
 .../step_definitions/login_steps.rb           | 13 ++++
 .../step_definitions/search_steps.rb          |  7 ++
 capybara_features/support/env.rb              |  2 +-
 capybara_features/support/paths.rb            | 24 +++----
 config/cucumber.yml                           |  2 +-
 config/routes.rb                              |  3 +-
 public/javascripts/advanced_search.js         | 66 +++++++++----------
 11 files changed, 96 insertions(+), 70 deletions(-)
 create mode 100644 capybara_features/step_definitions/children_setup_steps.rb
 create mode 100644 capybara_features/step_definitions/login_steps.rb
 create mode 100644 capybara_features/step_definitions/search_steps.rb

diff --git a/app/models/search_criteria.rb b/app/models/search_criteria.rb
index 2c283ced4..15edc116b 100644
--- a/app/models/search_criteria.rb
+++ b/app/models/search_criteria.rb
@@ -56,7 +56,4 @@ def self.build_joins(list, lucene_query)
     end
   end
   
-
-  
-  
 end
\ No newline at end of file
diff --git a/app/views/advanced_search/index.html.erb b/app/views/advanced_search/index.html.erb
index 074c0b979..c3f8fffe6 100644
--- a/app/views/advanced_search/index.html.erb
+++ b/app/views/advanced_search/index.html.erb
@@ -9,7 +9,7 @@
     <div class="error" style="display:none"></div>
   </div>
   <div class="help-text">Separate words by OR to search for more than one option eg. Tim OR Rahul</div>
-  <form>
+  <form action="index">
     <div class='criteria_menu' style='display:none;' >
       <div class='box-shadow content'>
         <div style="float:right; margin-left: 6px;">
diff --git a/capybara_features/advanced_search.feature b/capybara_features/advanced_search.feature
index bc48044e3..fac9713a8 100644
--- a/capybara_features/advanced_search.feature
+++ b/capybara_features/advanced_search.feature
@@ -1,24 +1,20 @@
-@wip
+
 Feature: So that I can find a child that has been entered in to RapidFTR
   As a user of the website
-  I want to use the advanced search criteria to find all relevant results
-
-  Background:
-    Given I am logged in
-    And I am on child advanced search page
+  I want to use the advanced search to find all relevant results
 
   @javascript
-  Scenario: Searching for children by the user who entered the details
+  Scenario: Searching for children by the user who created the child record
+     Given the following children exist in the system:
+       | name   | created_by    |
+       | Willis | aidWorker     |
+       | Will   | volunteer     |
 
-    Given the following children exist in the system:
-      | name   | created_by   |
-      | Willis | aid_worker_1 |
-      | Will   | aid_worker_2 |
+    And I am logged in
+    And I am on child advanced search page
 
     When I check "created_by"
-    And I fill in "aid_worker_1" for "created_by_value"
+    And I fill in "aidWorker" for "created_by_value"
     And I press "Search"
 
-    Then I should be on the child advanced search results page
-
-#    And I should see "Willis" in the search results
+    And I should see "Willis" in the search results
diff --git a/capybara_features/step_definitions/children_setup_steps.rb b/capybara_features/step_definitions/children_setup_steps.rb
new file mode 100644
index 000000000..3bb778b1d
--- /dev/null
+++ b/capybara_features/step_definitions/children_setup_steps.rb
@@ -0,0 +1,18 @@
+require 'spec/spec_helper'
+
+Given /^the following children exist in the system:$/ do |children_table|
+  children_table.hashes.each do |child_hash|
+    child_hash.reverse_merge!(
+            'birthplace' => 'Cairo',
+            'photo_path' => 'features/resources/jorge.jpg',
+            'reporter' => 'zubair',
+            'age_is' => 'Approximate'
+    )
+    photo = uploadable_photo(child_hash.delete('photo_path')) if child_hash['photo_path'] != ''
+    unique_id = child_hash.delete('unique_id')
+    child = Child.new_with_user_name(child_hash['created_by'], child_hash)
+    child.photo = photo
+    child['unique_identifier'] = unique_id if unique_id
+    child.create!
+  end
+end
\ No newline at end of file
diff --git a/capybara_features/step_definitions/login_steps.rb b/capybara_features/step_definitions/login_steps.rb
new file mode 100644
index 000000000..9fa152a03
--- /dev/null
+++ b/capybara_features/step_definitions/login_steps.rb
@@ -0,0 +1,13 @@
+Given /^I am logged in$/ do
+  Given "there is a User"
+  Given "I am on the login page"
+  Given "I fill in \"#{User.first.user_name}\" for \"user_name\""
+  Given "I fill in \"123\" for \"password\""
+  Given "I press \"Log in\""
+end
+
+Given /there is a User/ do
+  unless @user
+    Given "a user \"mary\" with a password \"123\""
+  end
+end
\ No newline at end of file
diff --git a/capybara_features/step_definitions/search_steps.rb b/capybara_features/step_definitions/search_steps.rb
new file mode 100644
index 000000000..5c9ba442e
--- /dev/null
+++ b/capybara_features/step_definitions/search_steps.rb
@@ -0,0 +1,7 @@
+require 'spec/spec_helper'
+
+Then /^I should see "([^\"]*)" in the search results$/ do |value|
+
+  match = page.find('//a', :text => value)
+  raise Spec::Expectations::ExpectationNotMetError, "Could not find the value: #{value} in the search results" unless match
+end
\ No newline at end of file
diff --git a/capybara_features/support/env.rb b/capybara_features/support/env.rb
index 3060122fd..c07a03168 100644
--- a/capybara_features/support/env.rb
+++ b/capybara_features/support/env.rb
@@ -47,7 +47,7 @@
 # after each scenario, which can lead to hard-to-debug failures in 
 # subsequent scenarios. If you do this, we recommend you create a Before
 # block that will explicitly put your database in a known state.
-Cucumber::Rails::World.use_transactional_fixtures = true
+Cucumber::Rails::World.use_transactional_fixtures = false
 
 # How to clean your database when transactions are turned off. See
 # http://github.com/bmabey/database_cleaner for more info.
diff --git a/capybara_features/support/paths.rb b/capybara_features/support/paths.rb
index 4d01352b3..91fd9464b 100644
--- a/capybara_features/support/paths.rb
+++ b/capybara_features/support/paths.rb
@@ -7,18 +7,18 @@ module NavigationHelpers
   #
   def path_to(page_name, options = {})
 
-    format = page_name[/^(?:|the )(\w+) formatted/,1]
-    options.reverse_merge!( :format => format )
+    format = page_name[/^(?:|the )(\w+) formatted/, 1]
+    options.reverse_merge!(:format => format)
 
     case page_name
 
       when /the home\s?page/
         '/'
-    when /the new create_custom_field page/
-      new_create_custom_field_path
+      when /the new create_custom_field page/
+        new_create_custom_field_path
 
-    when /the new create_custom_fields.feature page/
-      new_create_custom_fields.feature_path
+      when /the new create_custom_fields.feature page/
+        new_create_custom_fields.feature_path
 
       when /the new add_suggested_field_to_form_section page/
         new_add_suggested_field_to_form_section_path
@@ -39,19 +39,19 @@ def path_to(page_name, options = {})
         child_name = $1
         child = Summary.by_name(:key => child_name)
         raise "no child named '#{child_name}'" if child.nil?
-        child_path( child, options )
+        child_path(child, options)
 
       when /child record page for "(.+)"/
         child_name = $1
         child = Summary.by_name(:key => child_name)
         raise "no child named '#{child_name}'" if child.nil?
-        child_path( child, options )
+        child_path(child, options)
 
       when /change log page for "(.+)"/
         child_name = $1
         child = Summary.by_name(:key => child_name)
         raise "no child named '#{child_name}'" if child.nil?
-        child_history_path( child, options )
+        child_history_path(child, options)
 
       when /new user page/
         new_user_path(options)
@@ -95,7 +95,7 @@ def path_to(page_name, options = {})
 
       when /choose field type page/
         arbitrary_form_section = FormSection.new
-        new_formsection_field_path( arbitrary_form_section, options )
+        new_formsection_field_path(arbitrary_form_section, options)
 
       when /the edit user page for "(.+)"$/
         user = User.by_user_name(:key => $1)
@@ -116,7 +116,7 @@ def path_to(page_name, options = {})
       when /the edit administrator contact information page/
         edit_contact_information_path(:administrator)
       when /(the )?administrator contact page/
-          contact_information_path(:administrator, options)
+        contact_information_path(:administrator, options)
 
       when /all child Ids/
         child_ids_path
@@ -129,7 +129,7 @@ def path_to(page_name, options = {})
 
       else
         raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
-                "Now, go and add a mapping in #{__FILE__}"
+                  "Now, go and add a mapping in #{__FILE__}"
     end
   end
 end
diff --git a/config/cucumber.yml b/config/cucumber.yml
index 03a34f214..b29b7cbd2 100644
--- a/config/cucumber.yml
+++ b/config/cucumber.yml
@@ -1,3 +1,3 @@
 default: --format progress features --strict --tags ~@wip
-browser: --format progress capybara_features --strict --tags @javascript --tags ~@wip
+browser: --format progress capybara_features --strict --tags ~@wip
 wip: --tags @wip:3 --wip features
diff --git a/config/routes.rb b/config/routes.rb
index 916c4b391..6ca19fbc2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -48,7 +48,8 @@
     
   map.published_form_sections '/published_form_sections', :controller => 'publish_form_section', :action => 'form_sections'
   
-  map.resources :advanced_search, :only => [:new, :index]
+  map.resources :advanced_search, :only => [:index, :new]
+  map.advanced_search_index 'advanced_search/index', :controller => 'advanced_search', :action => 'index'
 
   map.resources :form_section
 
diff --git a/public/javascripts/advanced_search.js b/public/javascripts/advanced_search.js
index 238eddd51..166b9db44 100644
--- a/public/javascripts/advanced_search.js
+++ b/public/javascripts/advanced_search.js
@@ -1,32 +1,31 @@
 (function($){
 	$.fn.advancedSearch = function(options){
-
-		var element = $(this); 
+		var element = $(this);
 		var self = this;
-		
+
 		var menu = element.find(".criteria_menu");
-		
+
 		var criteriaList = $(this).find(".criteria-list")
 		var criteria = options.criteria
-		
+
 		var formList = element.find(".forms li");
 		formList.first().addClass("selected");
-		
+
 		var formFields = element.find(".fields");
 		formFields.first().addClass("selected");
-		formFields.first().find("li:first").addClass("selected");		
-				
+		formFields.first().find("li:first").addClass("selected");
+
 		self.selectedField = "";
-		
+
 		var buildCriteria = function(condition) {
 			var criteria = $("#criteria_template").tmpl(condition);
-			criteria.appendTo( criteriaList );			
+			criteria.appendTo( criteriaList );
 		};
-		
+
 		$.each(criteria, function(index, element){
 			buildCriteria(element);
 		});
-		
+
 		var selectForm = function(formLink){
 			formList.removeClass("selected");
 			formLink.addClass("selected");
@@ -37,55 +36,53 @@
 			selectedField = selectedFields.find("li:nth-child(" + (formList.index(formLink) + 1) + ")");
 			selectedField.addClass("selected");
 		}
-		
+
 		formList.click(function(){ selectForm($(this)); });
-			
+
 		element.find("ul.fields li").click(function(){
 			var field = $(this);
-			
+
 			if ($(this).is(".disabled")) {
 				return false;
 			}
-				
+
 			self.selectedField.find(".select-criteria").text(field.find("a").text());
 			self.selectedField.find(".criteria-field").val(field.find("input[type='hidden']").val())
 			menu.hide();
 		});
-		
-		
-		element.find(".add-criteria").live("click", function() { 
+
+		element.find(".add-criteria").live("click", function() {
 			var index = criteriaList.find("p:last .criteria-index").val() + 1;
-			buildCriteria({index: index, join: "AND", field_display_name: ""}) 
+			buildCriteria({index: index, join: "AND", field_display_name: ""})
 		});
-		
+
 		element.find(".remove-criteria").live("click", function(){
 			$(this).parents("p").remove();
 		});
-		
+
 		var disableSelectedFields = function() {
 			var selectedFields = $(".criteria-field").map(function(){
 				return $(this).val();
 			});
 			$(".fields li").removeClass("disabled");
-			$(".fields li").filter(function(index) { 
+			$(".fields li").filter(function(index) {
 				var fieldName = $(this).find(".field").val();
 				return ($.inArray(fieldName, selectedFields) != -1);
 			}).addClass("disabled");
-			
 		};
-		
+
 		var showCriteriaMenu = function()	{
 			disableSelectedFields();
 			var position = $(this).position();
 			menu.css("top", position.top + "px");
 			menu.css("left", position.left + "px");
 			menu.show();
-			
+
 			self.selectedField = $(this).parent();
 		};
-		
+
 		element.find(".select-criteria").live("click", showCriteriaMenu);
-		
+
 		menu.find(".close-link").click(function(){
 			menu.hide();
 		});
@@ -115,18 +112,18 @@
 			$('.criteria-list .criteria-field').each(function(){
 				if($(this).val() == "") { result = 'Please select a valid field name.'; }
 			});
-			
+
 			$('.criteria-list .criteria-value').each(function(){
 				if($(this).val() == "") { result = 'Please enter a valid field value.'; }
 			});
 			return result;
 		}
-		
-		element.find("form").submit(function() { 
+
+		element.find("form").submit(function() {
 			result = validate();
-			
+
 			if(result == ''){
-				$('.flash .error').hide(); 
+				$('.flash .error').hide();
 				return true;
 			} else {
 				$('.flash .error').show();
@@ -134,8 +131,5 @@
 				return false;
 			}
 		});
-		
-		
-		
 	}
 })(jQuery);
\ No newline at end of file

From a09041c1494ec8495cd02c041239e5344d907003 Mon Sep 17 00:00:00 2001
From: Rikesh Dhokia <rikeshdhokia@gmail.com>
Date: Sun, 3 Jul 2011 22:20:47 +1000
Subject: [PATCH 9/9] #622 rikesh: fix advanced searching with child field
 names - broke it earlier - and added functional test for the feature

---
 app/controllers/advanced_search_controller.rb |  3 ++-
 capybara_features/advanced_search.feature     | 27 +++++++++++++++----
 .../step_definitions/more_web_steps.rb        | 22 +++++++++++++++
 .../advanced_search_controller_spec.rb        |  4 +--
 4 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 capybara_features/step_definitions/more_web_steps.rb

diff --git a/app/controllers/advanced_search_controller.rb b/app/controllers/advanced_search_controller.rb
index 9aabdb28b..a6d2cf6c8 100644
--- a/app/controllers/advanced_search_controller.rb
+++ b/app/controllers/advanced_search_controller.rb
@@ -13,6 +13,7 @@ def index
     @forms = FormSection.by_order
     @aside = 'shared/sidebar_links'
     new_search = !params[:criteria_list]
+
     if new_search
       @criteria_list = [SearchCriteria.new]
       @results = []
@@ -28,7 +29,7 @@ def child_fields_selected?(criteria_list)
   end
 
   def append_advanced_user_criteria(value, list)
-    if (value.length > 0)
+    if (value)
       advanced_user_criteria = SearchCriteria.create_advanced_criteria({:field => "created_by", :value => value, :index => 12})
       list.push(advanced_user_criteria)
     end
diff --git a/capybara_features/advanced_search.feature b/capybara_features/advanced_search.feature
index fac9713a8..e797a22ed 100644
--- a/capybara_features/advanced_search.feature
+++ b/capybara_features/advanced_search.feature
@@ -1,14 +1,13 @@
-
 Feature: So that I can find a child that has been entered in to RapidFTR
   As a user of the website
   I want to use the advanced search to find all relevant results
 
   @javascript
   Scenario: Searching for children by the user who created the child record
-     Given the following children exist in the system:
-       | name   | created_by    |
-       | Willis | aidWorker     |
-       | Will   | volunteer     |
+    Given the following children exist in the system:
+      | name   | created_by |
+      | Willis | aidWorker  |
+      | Will   | volunteer  |
 
     And I am logged in
     And I am on child advanced search page
@@ -18,3 +17,21 @@ Feature: So that I can find a child that has been entered in to RapidFTR
     And I press "Search"
 
     And I should see "Willis" in the search results
+
+  @javascript
+  Scenario: Searching for children by the child name field
+    Given the following children exist in the system:
+      | name   | created_by |
+      | Willis | aidWorker  |
+      | Will   | volunteer  |
+
+    And I am logged in
+    And I am on child advanced search page
+
+    When I click text "Select A Criteria"
+    And I click text "Name"
+    And I fill in "Wil" for "criteria_list[0][value]"
+    And I press "Search"
+
+    And I should see "Willis" in the search results
+    And I should see "Will" in the search results
\ No newline at end of file
diff --git a/capybara_features/step_definitions/more_web_steps.rb b/capybara_features/step_definitions/more_web_steps.rb
new file mode 100644
index 000000000..8526b9464
--- /dev/null
+++ b/capybara_features/step_definitions/more_web_steps.rb
@@ -0,0 +1,22 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+require 'uri'
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
+
+module WithinHelpers
+  def with_scope(locator)
+    locator ? within(locator) { yield } : yield
+  end
+end
+World(WithinHelpers)
+
+When /^I click text "([^"]*)"(?: within "([^\"]*)")?$/ do |text_value, selector|
+  with_scope(selector) do
+    page.find('//a', :text => text_value).click
+
+  end
+end
diff --git a/spec/controllers/advanced_search_controller_spec.rb b/spec/controllers/advanced_search_controller_spec.rb
index 368b1ae18..1d77f84cf 100644
--- a/spec/controllers/advanced_search_controller_spec.rb
+++ b/spec/controllers/advanced_search_controller_spec.rb
@@ -11,7 +11,7 @@
 
      fake_results = [:fake_child,:fake_child]
      SearchService.should_receive(:search).with([search]).and_return(fake_results)
-     get :index, :criteria_list => {"0"=>{"field"=>"name_of_child", "value"=>"joe joe", "index"=>"0"}}, :created_by_value => ""
+     get :index, :criteria_list => {"0"=>{"field"=>"name_of_child", "value"=>"joe joe", "index"=>"0"}}, :created_by_value => nil
      assigns[:results].should == fake_results
   end
 
@@ -27,7 +27,7 @@
     SearchService.stub(:search).and_return([])
     SearchCriteria.stub(:build_from_params).and_return(["criteria_list"])
     
-    get :index, :criteria_list => {"0"=>{"field"=>"name_of_child", "value"=>"joe joe", "index"=>"0"}}, :created_by_value => ""
+    get :index, :criteria_list => {"0"=>{"field"=>"name_of_child", "value"=>"joe joe", "index"=>"0"}}, :created_by_value => nil
     assigns[:criteria_list].should == ["criteria_list"]
 
   end