spec/functional/func_screen_spec.rb in ProMotion-0.7.8 vs spec/functional/func_screen_spec.rb in ProMotion-1.0.0

@@ -3,35 +3,37 @@
 
   # Override controller to properly instantiate
   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
     view("Functional").should.be.kind_of UINavigationItemView
   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
 
       view("Basic").should.be.kind_of UINavigationItemView
       view("Functional").should.be.kind_of UINavigationItemButtonView
@@ -45,11 +47,11 @@
   end
 
   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
 
         view("Basic").should.be.kind_of UINavigationItemView
         @basic.close
@@ -57,9 +59,54 @@
         wait 0.6 do
           @basic = nil
           view("Functional").should.be.kind_of UINavigationItemView
         end
 
+      end
+    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