ProMotion 1.2.1 → 2.0.0.rc1

data/spec/helpers/test_helper.rb

@@ -3,3 +3,30 @@ class TestHelper
     UIDevice.currentDevice.systemVersion.to_f >= 7.0
   end
 end
+
+def silence_warnings(&block)
+  warn_level = $VERBOSE
+  $VERBOSE = nil
+  begin
+    result = block.call
+  ensure
+    $VERBOSE = warn_level
+  end
+  result
+end
+
+silence_warnings do
+  module Bacon
+    if ENV['filter']
+      $stderr.puts "Filtering specs that match: #{ENV['filter']}"
+      RestrictName = Regexp.new(ENV['filter'])
+    end
+
+    if ENV['filter_context']
+      $stderr.puts "Filtering contexts that match: #{ENV['filter_context']}"
+      RestrictContext = Regexp.new(ENV['filter_context'])
+    end
+
+    Backtraces = false if ENV['hide_backtraces']
+  end
+end

data/spec/unit/delegate_spec.rb

@@ -10,69 +10,6 @@ describe "PM::Delegate" do
     @subject.application(UIApplication.sharedApplication, didFinishLaunchingWithOptions:{jamon: true})
   end
 
-  it "should handle push notifications" do
-
-    @subject.mock!(:on_push_notification) do |notification, was_launched|
-      notification.should.be.kind_of(PM::PushNotification)
-      notification.alert.should == "Eating Bacon"
-      notification.badge.should == 42
-      notification.sound.should == "jamon"
-      @subject.aps_notification.should == notification
-    end
-
-    launch_options = { UIApplicationLaunchOptionsRemoteNotificationKey => PM::PushNotification.fake_notification(alert: "Eating Bacon", badge: 42, sound: "jamon").notification }
-    @subject.application(UIApplication.sharedApplication, willFinishLaunchingWithOptions: nil)
-    @subject.application(UIApplication.sharedApplication, didFinishLaunchingWithOptions:launch_options )
-
-  end
-
-  it "should return the registered push notification types as an array" do
-    @subject.registered_push_notifications.should == []
-    bits = 0
-    types = []
-    { badge:      UIRemoteNotificationTypeBadge,
-      sound:      UIRemoteNotificationTypeSound,
-      alert:      UIRemoteNotificationTypeAlert,
-      newsstand:  UIRemoteNotificationTypeNewsstandContentAvailability }.each do |symbol, bit|
-        UIApplication.sharedApplication.stub!(:enabledRemoteNotificationTypes, return: bit)
-        @subject.registered_push_notifications.should == [symbol]
-
-        bits |= bit
-        types << symbol
-        UIApplication.sharedApplication.stub!(:enabledRemoteNotificationTypes, return: bits)
-        @subject.registered_push_notifications.should == types
-      end
-  end
-
-  it "should return false for was_launched if the app is currently active on screen" do
-    @subject.mock!(:on_push_notification) do |notification, was_launched|
-      was_launched.should.be.false
-    end
-
-    fake_app = Struct.new(:applicationState).new(UIApplicationStateActive)
-    remote_notification = PM::PushNotification.fake_notification.notification
-    @subject.application(fake_app, didReceiveRemoteNotification: remote_notification)
-  end
-
-  it "should return true for was_launched if app was launched from background" do
-    @subject.mock!(:on_push_notification) do |notification, was_launched|
-      was_launched.should.be.true
-    end
-
-    fake_app = Struct.new(:applicationState).new(UIApplicationStateBackground)
-    remote_notification = PM::PushNotification.fake_notification.notification
-    @subject.application(fake_app, didReceiveRemoteNotification: remote_notification)
-  end
-
-  it "should return true for was_launched if the app wasn't running" do
-    @subject.mock!(:on_push_notification) do |notification, was_launched|
-      was_launched.should.be.true
-    end
-
-    launch_options = { UIApplicationLaunchOptionsRemoteNotificationKey => PM::PushNotification.fake_notification.notification }
-    @subject.application(UIApplication.sharedApplication, didFinishLaunchingWithOptions:launch_options )
-  end
-
   it "should set home_screen when opening a new screen" do
     @subject.application(UIApplication.sharedApplication, willFinishLaunchingWithOptions: nil)
     @subject.application(UIApplication.sharedApplication, didFinishLaunchingWithOptions: nil)
@@ -151,13 +88,13 @@ if TestHelper.ios7
 
     before do
       @subject = TestDelegateRed.new
-      @map = TestMapScreen.new modal: true, nav_bar: true
-      @map.view_will_appear(false)
-      @subject.open @map
+      @screen = BasicScreen.new nav_bar: true
+      @screen.view_will_appear(false)
+      @subject.open @screen
     end
 
     it 'should set the application tint color on iOS 7' do
-      @map.view.tintColor.should == UIColor.redColor
+      @screen.view.tintColor.should == UIColor.redColor
     end
 
   end

data/spec/unit/image_title_screen.rb

@@ -0,0 +1,9 @@
+describe "ProMotion::Screen UIImage title" do
+  def controller
+    @controller = ImageTitleScreen.new(nav_bar: true)
+  end
+
+  it "should allow an image title" do
+    controller.navigationItem.titleView.should.be.kind_of UIImageView
+  end
+end

data/spec/unit/image_view_title_screen.rb

@@ -0,0 +1,9 @@
+describe "ProMotion::Screen UIImageView title" do
+  def controller
+    @controller = ImageViewTitleScreen.new(nav_bar: true)
+  end
+
+  it "should allow an image title" do
+    controller.navigationItem.titleView.should.be.kind_of UIImageView
+  end
+end

data/spec/unit/load_view_spec.rb

@@ -0,0 +1,27 @@
+describe "load_view and on_load tests" do
+  def screen
+    @screen ||= LoadViewScreen.new
+  end
+
+  def table_screen
+    @table_screen ||= LoadViewTableScreen.new
+  end
+
+  it "should call load_view when requesting the view" do
+    screen.view.should.be.kind_of(MyView)
+  end
+
+  it "should call on_load after creating the view" do
+    screen.view.should.be.kind_of(MyView)
+    screen.view.backgroundColor.should == UIColor.redColor
+  end
+
+  it "should call load_view when requesting the view in a table screen" do
+    table_screen.view.should.be.kind_of(MyTableView)
+  end
+
+  it "should call on_load after creating the view in a table screen" do
+    table_screen.view.should.be.kind_of(MyTableView)
+    table_screen.view.backgroundColor.should == UIColor.greenColor
+  end
+end

data/spec/unit/main_spec.rb

@@ -4,10 +4,4 @@ describe "pro motion module" do
     should.not.raise(NameError) { PM }
   end
 
-  it "should not allow screen inclusion into just any class" do
-    dummy = DummyClass.new
-    dummy.extend ProMotion::ScreenModule
-    should.raise(StandardError) { dummy.on_create }
-  end
-
 end

data/spec/unit/screen_helpers_spec.rb

@@ -123,7 +123,7 @@ describe "screen helpers" do
       end
 
       it "should apply properties when opening a new screen" do
-        new_screen = @screen.send(:set_up_screen_for_open, BasicScreen, title: 'Some Title', modal: true, hide_tab_bar: true, nav_bar: true)
+        new_screen = @screen.send(:set_up_screen_for_open, BasicScreen, { title: 'Some Title', modal: true, hide_tab_bar: true, nav_bar: true })
 
         new_screen.parent_screen.should == @screen
         new_screen.title.should == 'Some Title'
@@ -140,17 +140,9 @@ describe "screen helpers" do
           animated.should == true
           completion.should == nil
         end
-        @screen.send(:present_modal_view_controller, new_screen, true, nil)
+        @screen.send(:present_modal_view_controller, new_screen, { animated: true, completion: nil })
       end
 
-      # it "should push screen onto nav controller stack inside a tab bar" do
-      #   # TODO: Implement this test
-      # end
-
-      # it "should set the tab bar selectedIndex when opening a screen inside a tab bar" do
-      #   # TODO: Implement this test
-      # end
-
       it "should open a root screen if :close_all is provided" do
         @screen.mock!(:open_root_screen) { |screen| screen.should.be.instance_of BasicScreen }
         screen = @screen.open BasicScreen, close_all: true
@@ -158,20 +150,20 @@ describe "screen helpers" do
       end
 
       it "should present a modal screen if :modal is provided" do
-        @screen.mock!(:present_modal_view_controller) do |screen, animated, completion|
+        @screen.mock!(:present_modal_view_controller) do |screen, args|
           screen.should.be.instance_of BasicScreen
-          animated.should == true
-          completion.should.be.kind_of Proc
+          args[:animated].should == true
+          args[:completion].should.be.kind_of Proc
         end
         screen = @screen.open BasicScreen, modal: true, completion: lambda{}
         screen.should.be.kind_of BasicScreen
       end
 
       it "should present a modal screen if open_modal is used" do
-        @screen.mock!(:present_modal_view_controller) do |screen, animated, completion|
+        @screen.mock!(:present_modal_view_controller) do |screen, args|
           screen.should.be.instance_of BasicScreen
-          animated.should == true
-          completion.should == nil
+          args[:animated].should == true
+          args[:completion].should == nil
         end
         screen = @screen.open_modal BasicScreen
         screen.should.be.kind_of BasicScreen
@@ -191,7 +183,7 @@ describe "screen helpers" do
 
       it "should open screen in tab bar if :in_tab is provided" do
         @screen.stub!(:tab_bar, return: true)
-        @screen.mock!(:present_view_controller_in_tab_bar_controller) do |screen, tab_name|
+        @screen.mock!(:open_in_tab) do |screen, tab_name|
           screen.should.be.instance_of BasicScreen
           tab_name.should == 'my_tab'
         end
@@ -220,6 +212,20 @@ describe "screen helpers" do
         screen.should == new_screen
       end
 
+      it "should not double-open a view controller if it's already been opened" do
+        parent_screen = HomeScreen.new(nav_bar: true)
+        new_screen = BasicScreen.new
+        @pushed = 0
+        parent_screen.navigationController.mock!("pushViewController:animated:") do |vc, animated|
+          @pushed += 1
+          parent_screen.navigationController.stub!("topViewController", return: vc)
+        end
+        parent_screen.open new_screen
+        @pushed.should == 1
+        parent_screen.open new_screen
+        @pushed.should == 1
+      end
+
     end
 
 

data/spec/unit/screen_spec.rb

@@ -9,7 +9,7 @@ describe "screen properties" do
   end
 
   it "should store title" do
-    HomeScreen.get_title.should == 'Home'
+    HomeScreen.title.should == 'Home'
   end
 
   it "should set default title on new instances" do
@@ -23,33 +23,28 @@ describe "screen properties" do
 
   it "should not let the instance reset the default title" do
     @screen.title = "instance method"
-    HomeScreen.get_title.should != 'instance method'
+    HomeScreen.title.should != 'instance method'
   end
 
-  it "should set the tab bar item with a system icon" do
-    @screen.set_tab_bar_item system_icon: :contacts
+  it "should set the tab bar item with a system item" do
+    @screen.set_tab_bar_item system_item: :contacts
     comparison = UITabBarItem.alloc.initWithTabBarSystemItem(UITabBarSystemItemContacts, tag: 0)
     @screen.tabBarItem.systemItem.should == comparison.systemItem
     @screen.tabBarItem.tag.should == comparison.tag
     @screen.tabBarItem.image.should == comparison.image
   end
 
-  it "should set the tab bar item with a custom icon and title" do
-    @screen.set_tab_bar_item title: "My Screen", icon: "list"
+  it "should set the tab bar item with a custom item and title" do
+    @screen.set_tab_bar_item title: "My Screen", item: "list"
 
-    icon_image = UIImage.imageNamed("list")
-    comparison = UITabBarItem.alloc.initWithTitle("My Screen", image: icon_image, tag: 0)
+    item_image = UIImage.imageNamed("list")
+    comparison = UITabBarItem.alloc.initWithTitle("My Screen", image: item_image, tag: 0)
 
     @screen.tabBarItem.systemItem.should == comparison.systemItem
     @screen.tabBarItem.tag.should == comparison.tag
     @screen.tabBarItem.image.should == comparison.image
   end
 
-  it "should store debug mode" do
-    HomeScreen.debug_mode = true
-    HomeScreen.debug_mode.should == true
-  end
-
   it "#modal? should be true" do
     @screen.modal?.should == true
   end
@@ -151,7 +146,7 @@ describe "screen properties" do
   describe "bar button behavior" do
     describe "system bar buttons" do
       before do
-        @screen.set_nav_bar_right_button nil, action: :add_something, system_icon: UIBarButtonSystemItemAdd
+        @screen.set_nav_bar_button :right, title: nil, action: :add_something, system_item: UIBarButtonSystemItemAdd
       end
 
       it "has a right bar button item of the correct type" do
@@ -163,9 +158,19 @@ describe "screen properties" do
       end
     end
 
+    describe "bar button tint colors" do
+      before do
+        @screen.set_nav_bar_button :right, title: nil, action: :add_something, system_item: UIBarButtonSystemItemAdd, tint_color: UIColor.blueColor
+      end
+
+      it "sets the tint color" do
+        CGColorEqualToColor(@screen.navigationItem.rightBarButtonItem.tintColor, UIColor.blueColor).should == true
+      end
+    end
+
     describe 'titled bar buttons' do
       before do
-        @screen.set_nav_bar_right_button "Save", action: :save_something, style: UIBarButtonItemStyleDone
+        @screen.set_nav_bar_button :right, title: "Save", action: :save_something, style: UIBarButtonItemStyleDone
       end
 
       it "has a right bar button item of the correct type" do
@@ -184,7 +189,7 @@ describe "screen properties" do
     describe 'image bar buttons' do
       before do
         @image = UIImage.alloc.init
-        @screen.set_nav_bar_right_button @image, action: :save_something, style: UIBarButtonItemStyleDone
+        @screen.set_nav_bar_button :right, title: @image, action: :save_something, style: UIBarButtonItemStyleDone
       end
 
       it "has a right bar button item of the correct type" do
@@ -256,4 +261,3 @@ describe "screen with toolbar" do
     screen.navigationController.toolbarHidden?.should == false
   end
 end
-

data/spec/unit/searchable_table_spec.rb

@@ -0,0 +1,55 @@
+describe "Searchable table spec" do
+  # Override controller to properly instantiate
+  def controller
+    @controller ||= begin
+      c = TableScreenSearchable.new
+      c.on_load
+      c
+    end
+  end
+
+  after do
+    @controller = nil
+  end
+
+  it "should show all 50 states" do
+    controller.tableView(controller.tableView, numberOfRowsInSection:0).should == 50
+  end
+
+  it "should allow searching for all the 'New' states" do
+    controller.searchDisplayController(controller, shouldReloadTableForSearchString:"New")
+    controller.tableView(controller.tableView, numberOfRowsInSection:0).should == 4
+  end
+
+  it "should allow ending searches" do
+    controller.searchDisplayController(controller, shouldReloadTableForSearchString:"North")
+    controller.tableView(controller.tableView, numberOfRowsInSection:0).should == 2
+    controller.searchDisplayControllerWillEndSearch(controller)
+    controller.tableView(controller.tableView, numberOfRowsInSection:0).should == 50
+  end
+
+  it "should expose the search_string variable and clear it properly" do
+    controller.searchDisplayController(controller, shouldReloadTableForSearchString:"North")
+
+    controller.search_string.should == "north"
+    controller.original_search_string.should == "North"
+
+    controller.searchDisplayControllerWillEndSearch(controller)
+
+    controller.search_string.should == false
+    controller.original_search_string.should == false
+  end
+
+  it "should call the start and stop searching callbacks properly" do
+    controller.will_begin_search_called.should == nil
+    controller.will_end_search_called.should == nil
+
+    controller.searchDisplayControllerWillBeginSearch(controller)
+    controller.searchDisplayController(controller, shouldReloadTableForSearchString:"North")
+    controller.will_begin_search_called.should == true
+
+    controller.searchDisplayControllerWillEndSearch(controller)
+    controller.will_end_search_called.should == true
+  end
+
+end

data/spec/unit/split_screen_in_tab_bar_spec.rb

@@ -6,7 +6,7 @@ describe "split screen in tab bar functionality" do
     @master_screen = HomeScreen.new nav_bar: true
     @detail_screen = BasicScreen.new nav_bar: true
 
-    @split_screen = @app.create_split_screen @master_screen, @detail_screen, icon: "list", title: "Spec"
+    @split_screen = @app.create_split_screen @master_screen, @detail_screen, item: "list", title: "Spec"
     @tab = @app.open_tab_bar @split_screen, HomeScreen, BasicScreen
   end
 
@@ -49,15 +49,15 @@ describe "split screen in tab bar functionality" do
   it "should set the tab bar first viewController to the split screen" do
     @tab.viewControllers.first.should == @split_screen
   end
-  
+
   it "should set the bar bar item for the split screen" do
     @split_screen.tabBarItem.is_a?(UITabBarItem).should == true
   end
-  
-  it "should set the tab bar icon of the split screen" do
+
+  it "should set the tab bar item of the split screen" do
     @split_screen.tabBarItem.image.is_a?(UIImage).should == true
   end
-  
+
   it "should set the tab bar title of the split screen" do
     @split_screen.tabBarItem.title.is_a?(String).should == true
     @split_screen.tabBarItem.title.should == "Spec"

data/spec/unit/split_screen_spec.rb

@@ -37,9 +37,9 @@ describe "split screen functionality" do
   end
 
   it "should set the title on both screens" do
-    @master_screen.class.send(:get_title).should == "Master"
+    @master_screen.class.title.should == "Master"
     @master_screen.title.should == "Master"
-    @detail_screen.class.send(:get_title).should == "Detail"
+    @detail_screen.class.title.should == "Detail"
     @detail_screen.title.should == "Detail"
   end
 end
@@ -57,9 +57,9 @@ describe "split screen with UIViewControllers with ScreenModule" do
   end
 
   it "should set the title on both screens" do
-    @master_screen.class.send(:get_title).should == "Test Title"
+    @master_screen.class.title.should == "Test Title"
     @master_screen.title.should == "Test Title"
-    @detail_screen.class.send(:get_title).should == "Detail"
+    @detail_screen.class.title.should == "Detail"
     @detail_screen.title.should == "Detail"
   end