From 80f51245ec139730ec495c2abf99566930c14207 Mon Sep 17 00:00:00 2001 From: Mark Rickert Date: Thu, 15 Aug 2013 17:07:39 -0400 Subject: [PATCH] Changed on_ to will_ --- lib/ProMotion/table/extensions/searchable.rb | 5 ++--- spec/functional/func_searchable_table_spec.rb | 8 ++++---- spec/helpers/table_screen_searchable.rb | 10 +++++----- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/ProMotion/table/extensions/searchable.rb b/lib/ProMotion/table/extensions/searchable.rb index 7402b97..542289b 100644 --- a/lib/ProMotion/table/extensions/searchable.rb +++ b/lib/ProMotion/table/extensions/searchable.rb @@ -51,13 +51,12 @@ module ProMotion @promotion_table_data_data = nil self.table_view.setScrollEnabled true self.table_view.reloadData - @table_search_display_controller.delegate.on_end_search if @table_search_display_controller.delegate.respond_to? "on_end_search" + @table_search_display_controller.delegate.will_end_search if @table_search_display_controller.delegate.respond_to? "will_end_search" end def searchDisplayControllerWillBeginSearch(controller) self.table_view.setScrollEnabled false - puts 'searchDisplayControllerWillBeginSearch(controller)' - @table_search_display_controller.delegate.on_begin_search if @table_search_display_controller.delegate.respond_to? "on_begin_search" + @table_search_display_controller.delegate.will_begin_search if @table_search_display_controller.delegate.respond_to? "will_begin_search" end end end diff --git a/spec/functional/func_searchable_table_spec.rb b/spec/functional/func_searchable_table_spec.rb index 3f57ed5..a822341 100644 --- a/spec/functional/func_searchable_table_spec.rb +++ b/spec/functional/func_searchable_table_spec.rb @@ -42,15 +42,15 @@ describe "Searchable table spec" do end it "should call the start and stop searching callbacks properly" do - @controller.on_begin_search_called.should == nil - @controller.on_end_search_called.should == nil + @controller.will_begin_search_called.should == nil + @controller.will_end_search_called.should == nil @controller.searchDisplayControllerWillBeginSearch(@controller) @controller.searchDisplayController(@controller, shouldReloadTableForSearchString:"North") - @controller.on_begin_search_called.should == true + @controller.will_begin_search_called.should == true @controller.searchDisplayControllerWillEndSearch(@controller) - @controller.on_end_search_called.should == true + @controller.will_end_search_called.should == true end end diff --git a/spec/helpers/table_screen_searchable.rb b/spec/helpers/table_screen_searchable.rb index 7cde6e3..90350e9 100644 --- a/spec/helpers/table_screen_searchable.rb +++ b/spec/helpers/table_screen_searchable.rb @@ -2,7 +2,7 @@ class TableScreenSearchable < TestTableScreen searchable - attr_accessor :on_end_search_called, :on_begin_search_called + attr_accessor :will_end_search_called, :will_begin_search_called def table_data @search_table_data ||= [{ @@ -61,12 +61,12 @@ class TableScreenSearchable < TestTableScreen }] end - def on_begin_search - self.on_begin_search_called = true + def will_begin_search + self.will_begin_search_called = true end - def on_end_search - self.on_end_search_called = true + def will_end_search + self.will_end_search_called = true end end