ProMotion 0.7.8 → 1.0.0

data/spec/functional/func_screen_spec.rb

@@ -5,11 +5,13 @@ describe "ProMotion::Screen functional" do
   def controller
     rotate_device to: :portrait, button: :bottom
     @controller ||= FunctionalScreen.new(nav_bar: true)
-    @controller.main_controller
+    @root_screen = @controller
+    @controller.navigation_controller
   end
 
   after do
     @controller = nil
+    @root_screen = nil
   end
 
   it "should have a navigation bar" do
@@ -17,19 +19,19 @@ describe "ProMotion::Screen functional" do
   end
 
   it "should allow setting a left nav bar button" do
-    @controller.set_nav_bar_button :left, title: "Cool", action: :triggered_button
+    @root_screen.set_nav_bar_button :left, title: "Cool", action: :triggered_button
     tap("Cool")
-    @controller.button_was_triggered.should.be.true
+    @root_screen.button_was_triggered.should.be.true
   end
 
   it "should allow setting a right nav bar button" do
-    @controller.set_nav_bar_button :right, title: "Cool2", action: :triggered_button
+    @root_screen.set_nav_bar_button :right, title: "Cool2", action: :triggered_button
     tap("Cool2")
-    @controller.button_was_triggered.should.be.true
+    @root_screen.button_was_triggered.should.be.true
   end
 
   it "should allow opening another screen in the same nav bar and have a back button that is operational" do
-    @controller.open BasicScreen
+    @root_screen.open BasicScreen
 
     wait 0.5 do
 
@@ -47,7 +49,7 @@ describe "ProMotion::Screen functional" do
   it "should allow opening and closing a modal screen" do
     @basic = BasicScreen.new(nav_bar: true)
     wait 0.1 do
-      @controller.open_modal @basic
+      @root_screen.open_modal @basic
 
       wait 0.6 do
 
@@ -63,4 +65,49 @@ describe "ProMotion::Screen functional" do
     end
   end
 
+  it "should fire the will_present, on_present, will_dismiss, and on_dismiss_methods" do
+    @presented_screen = PresentScreen.new
+    @root_screen.open @presented_screen
+    wait 0.6 do
+      @presented_screen.will_present_fired.should == true
+      @presented_screen.on_present_fired.should == true
+
+      @presented_screen.will_dismiss_fired.should.not == true
+      @presented_screen.on_dismiss_fired.should.not == true
+
+      @presented_screen.reset
+
+      @presented_screen.close
+      wait 0.6 do
+        @presented_screen.will_dismiss_fired.should == true
+        @presented_screen.on_dismiss_fired.should == true
+
+        @presented_screen.will_present_fired.should.not == true
+        @presented_screen.on_present_fired.should.not == true
+
+        @presented_screen = nil
+      end
+    end
+  end
+
+  it "should pop to the root view controller" do
+    @root_vc = @controller.navigation_controller.visibleViewController
+    @controller.navigation_controller.viewControllers.count.should == 1
+    @controller.open BasicScreen.new
+    wait 0.6 do
+      @controller.open BasicScreen.new
+      wait 0.6 do
+        @controller.open BasicScreen.new
+        wait 0.6 do
+          @controller.navigation_controller.viewControllers.count.should == 4
+          @controller.close to_screen: :root
+          wait 0.6 do
+            @controller.navigation_controller.viewControllers.count.should == 1
+            @controller.navigation_controller.topViewController.should == @root_vc
+          end
+        end
+      end
+    end
+  end
+
 end

data/spec/functional/func_searchable_table_spec.rb

@@ -5,7 +5,7 @@ describe "Searchable table spec" do
   def controller
     @controller ||= TableScreenSearchable.new(nav_bar: true)
     @controller.on_load
-    @controller.main_controller
+    @controller.navigation_controller
   end
 
   it "should be rotated in portrait mode" do

data/spec/functional/func_tab_bar_spec.rb

@@ -0,0 +1,78 @@
+describe "PM::Tabs" do
+  tests PM::Tabs
+
+  # Override controller to properly instantiate
+  def controller
+    @app ||= TestDelegate.new
+    
+    @screen1 = BasicScreen.new(nav_bar: true, title: "Screen 1")
+    @screen2 = BasicScreen.new(nav_bar: true, title: "Screen 2")
+    @screen3 = BasicScreen.new(title: "Screen 3")
+    @screen4 = BasicScreen.new(title: "Screen 4")
+    
+    @controller ||= @app.open_tab_bar(@screen1, @screen2, @screen3, @screen4)
+    @tab_bar = @controller
+  end
+
+  it "should create a UITabBarController" do
+    @app.window.rootViewController.should.be.kind_of UITabBarController
+  end
+  
+  it "should have four tabs" do
+    @tab_bar.viewControllers.length.should == 4
+  end
+  
+  it "should have the right screens in the right places" do
+    @tab_bar.viewControllers[0].should == @screen1.navigationController
+    @tab_bar.viewControllers[1].should == @screen2.navigationController
+    @tab_bar.viewControllers[2].should == @screen3
+    @tab_bar.viewControllers[3].should == @screen4
+  end
+  
+  it "should allow opening a tab by the name from any screen" do
+    @screen1.open_tab "Screen 2"
+    @tab_bar.selectedIndex.should == 1
+    @screen2.open_tab "Screen 3"
+    @tab_bar.selectedIndex.should == 2
+    @screen3.open_tab "Screen 4"
+    @tab_bar.selectedIndex.should == 3
+    @screen4.open_tab "Screen 1"
+    @tab_bar.selectedIndex.should == 0
+  end
+
+  it "should allow opening a tab by the index from any screen" do
+    @screen1.open_tab 1
+    @tab_bar.selectedIndex.should == 1
+    @screen2.open_tab 2
+    @tab_bar.selectedIndex.should == 2
+    @screen3.open_tab 3
+    @tab_bar.selectedIndex.should == 3
+    @screen4.open_tab 0
+    @tab_bar.selectedIndex.should == 0
+  end
+  
+  it "should allow opening a tab from the app_delegate" do
+    @app.open_tab "Screen 2"
+    @tab_bar.selectedIndex.should == 1
+    @app.open_tab "Screen 3"
+    @tab_bar.selectedIndex.should == 2
+    @app.open_tab "Screen 4"
+    @tab_bar.selectedIndex.should == 3
+    @app.open_tab "Screen 1"
+    @tab_bar.selectedIndex.should == 0
+  end
+  
+  it "should allow opening a tab by accessing the tab bar directly" do
+    @tab_bar.open_tab "Screen 2"
+    @tab_bar.selectedIndex.should == 1
+    @tab_bar.open_tab "Screen 3"
+    @tab_bar.selectedIndex.should == 2
+    @tab_bar.open_tab "Screen 4"
+    @tab_bar.selectedIndex.should == 3
+    @tab_bar.open_tab "Screen 1"
+    @tab_bar.selectedIndex.should == 0
+  end
+  
+  
+
+end

data/spec/functional/func_table_screen_spec.rb

@@ -6,11 +6,7 @@ describe "ProMotion::TestTableScreen functionality" do
     rotate_device to: :portrait, button: :bottom
     @controller ||= TestTableScreen.new(nav_bar: true)
     @controller.on_load
-    @controller.main_controller
-  end
-
-  after do
-    @controller = nil
+    @controller.navigation_controller
   end
 
   it "should have a navigation bar" do
@@ -38,36 +34,87 @@ describe "ProMotion::TestTableScreen functionality" do
   end
 
   it "should delete the specified row from the table view on tap" do
-    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 6
+    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 7
     tap("Delete the row below")
-    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 5
+    wait 0.3 do
+      @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 6
+    end
   end
 
   it "should delete the specified row from the table view on tap with an animation" do
-    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 6
+    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 7
     tap("Delete the row below with an animation")
-    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 5
+    wait 0.3 do
+      @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 6
+    end
+  end
+
+  # TODO: Why is it so complicated to find the delete button??
+  it "should use editing_style to delete the table row" do
+    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 7
+    @controller.cell_was_deleted.should != true
+    flick("Just another deletable blank row", :to => :left)
+
+    wait 0.25 do
+      # Tap the delete button
+      view('Just another deletable blank row').superview.superview.subviews.each do |subview|
+        if subview.class == UITableViewCellDeleteConfirmationControl
+          tap subview
+          wait 0.25 do
+            @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 6
+            @controller.cell_was_deleted.should == true
+          end
+        end
+      end
+    end
+  end
+
+  it "should not allow deleting if on_cell_delete returns `false`" do
+    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 7
+    @controller.cell_was_deleted.should != true
+    flick("A non-deletable blank row", :to => :left)
+
+    wait 0.25 do
+      # Tap the delete button
+      view('A non-deletable blank row').superview.superview.subviews.each do |subview|
+        if subview.class == UITableViewCellDeleteConfirmationControl
+          tap subview
+          wait 0.25 do
+            @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 7
+            @controller.cell_was_deleted.should != false
+          end
+        end
+      end
+    end
   end
 
   it "should call a method when the switch is flipped" do
     @controller.scroll_to_bottom
     tap "switch_1"
-    @controller.tap_counter.should == 1
+    wait 0.3 do
+      @controller.tap_counter.should == 1
+    end
   end
 
   it "should call the method with arguments when the switch is flipped and when the cell is tapped" do
     @controller.scroll_to_bottom
     tap "switch_3"
-    @controller.tap_counter.should == 3
+    wait 0.3 do
+      @controller.tap_counter.should == 3
 
-    tap "Switch With Cell Tap, Switch Action And Parameters"
-    @controller.tap_counter.should == 13
+      tap "Switch With Cell Tap, Switch Action And Parameters"
+      wait 0.3 do
+        @controller.tap_counter.should == 13
+      end
+    end
   end
 
   it "should call the method with arguments when the switch is flipped" do
     @controller.scroll_to_bottom
     tap "switch_2"
-    @controller.tap_counter.should == 3
+    wait 0.3 do
+      @controller.tap_counter.should == 3
+    end
   end
 
 end

data/spec/functional/func_web_screen_spec.rb

@@ -0,0 +1,51 @@
+describe "ProMotion::TestWebScreen functionality" do
+  extend WebStub::SpecHelpers
+
+  before  { disable_network_access! }
+  after   { enable_network_access! }
+
+  tests PM::TestWebScreen
+
+  # Override controller to properly instantiate
+  def controller
+    rotate_device to: :portrait, button: :bottom
+    @webscreen ||= TestWebScreen.new(nav_bar: true)
+    @webscreen.navigation_controller
+  end
+
+  after do
+    @webscreen = nil
+  end
+
+  it "should have the proper html content" do
+    file_name = "WebScreen.html"
+
+    @webscreen.set_content(file_name)
+
+    @loaded_file = File.read(File.join(NSBundle.mainBundle.resourcePath, file_name))
+    wait_for_change @webscreen, 'load_finished' do
+      @webscreen.html.delete("\n").should == @loaded_file.delete("\n")
+    end
+  end
+
+  it "should allow you to navigate to a website" do
+    stub_request(:get, "https://www.google.com/").
+      to_return(body: %q{Google! <form action="/search">%}, content_type: "text/html")
+
+    @webscreen.open_url(NSURL.URLWithString("https://www.google.com/"))
+    wait_for_change @webscreen, 'load_finished' do
+      @webscreen.html.include?('<form action="/search"').should == true
+    end
+  end
+
+  it "should manipulate the webscreen contents with javascript" do
+    @webscreen.set_content('<h1 id="cool">Something Cool</h1>')
+
+    wait_for_change @webscreen, 'load_finished' do
+      @webscreen.evaluate('document.getElementById("cool").innerHTML = "Changed"')
+      @webscreen.html.should =~ /<h1 id="cool">Changed<\/h1>/
+    end
+
+  end
+
+end

data/spec/helpers/map_screen.rb

@@ -0,0 +1,51 @@
+class TestMapScreen < PM::MapScreen
+
+  attr_accessor :infinite_loop_points
+
+  start_position latitude: 35.090648651123, longitude: -82.965972900391, radius: 4
+  title "Gorges State Park, NC"
+
+  def get_title
+    self.title
+  end
+
+  def promotion_annotation_data
+    @promotion_annotation_data
+  end
+
+  def annotation_data
+    # Partial set of data from "GPS Map of Gorges State Park": http://www.hikewnc.info/maps/gorges-state-park/gps-map
+    @data ||= [{
+      longitude: -82.965972900391,
+      latitude: 35.090648651123,
+      title: "Rainbow Falls",
+      subtitle: "Nantahala National Forest",
+    },{
+      longitude: -82.966093558105,
+      latitude: 35.092520895652,
+      title: "Turtleback Falls",
+      subtitle: "Nantahala National Forest",
+    },{
+      longitude: -82.95916,
+      latitude: 35.07496,
+      title: "Windy Falls"
+    },{
+      longitude: -82.943031505056,
+      latitude: 35.102516828489,
+      title: "Upper Bearwallow Falls",
+      subtitle: "Gorges State Park",
+    },{
+      longitude: -82.956244328014,
+      latitude: 35.085548421623,
+      title: "Stairway Falls",
+      subtitle: "Gorges State Park",
+    }]
+  end
+
+  def lookup_infinite_loop
+    look_up_address address: "1 Infinite Loop" do |points, error|
+      self.infinite_loop_points = points
+    end
+  end
+
+end

data/spec/helpers/present_screen.rb

@@ -0,0 +1,26 @@
+class PresentScreen < PM::Screen
+  attr_accessor :will_present_fired, :on_present_fired, :will_dismiss_fired, :on_dismiss_fired
+
+  def will_present
+    self.will_present_fired = true
+  end
+
+  def on_present
+    self.on_present_fired = true
+  end
+
+  def will_dismiss
+    self.will_dismiss_fired = true
+  end
+
+  def on_dismiss
+    self.on_dismiss_fired = true
+  end
+
+  def reset
+    self.will_present_fired = false
+    self.on_present_fired = false
+    self.will_dismiss_fired = false
+    self.on_dismiss_fired = false
+  end
+end

data/spec/helpers/tab_screen.rb

@@ -0,0 +1,4 @@
+class TabScreen < PM::Screen
+  title "Tab"
+  tab_bar_item title: "Tab Item", icon: "list"
+end

data/spec/helpers/table_screen.rb

@@ -1,6 +1,6 @@
-class TestTableScreen < ProMotion::SectionedTableScreen
+class TestTableScreen < ProMotion::TableScreen
 
-  attr_accessor :tap_counter
+  attr_accessor :tap_counter, :cell_was_deleted
 
   def promotion_table_data
     @promotion_table_data
@@ -17,7 +17,8 @@ class TestTableScreen < ProMotion::SectionedTableScreen
         { title: "Increment", action: :increment_counter_by, arguments: {number: 3} },
         { title: "Add New Row", action: :add_tableview_row },
         { title: "Delete the row below", action: :delete_cell, arguments: {section: 0, row:3} },
-        { title: "Just another blank row" },
+        { title: "Just another deletable blank row", editing_style: :delete },
+        { title: "A non-deletable blank row", editing_style: :delete },
         { title: "Delete the row below with an animation", action: :delete_cell, arguments: {animated: true, section: 0, row:5 } },
         { title: "Just another blank row" }
       ]
@@ -86,6 +87,14 @@ class TestTableScreen < ProMotion::SectionedTableScreen
     end
   end
 
+  def on_cell_deleted(cell)
+    if cell[:title] == "A non-deletable blank row"
+      false 
+    else
+      self.cell_was_deleted = true
+    end
+  end
+
   def increment_counter
     self.tap_counter = self.tap_counter + 1
   end