From 19d6a4f18182c930ecfa7eb750a15cdb3c3e1ec5 Mon Sep 17 00:00:00 2001 From: Jamon Holmgren Date: Fri, 17 May 2013 07:39:45 -0700 Subject: [PATCH] Fixing specs to work in RM 2.0 https://github.com/clearsightstudio/ProMotion/blob/version-0.6/lib/ProMo tion/screen_helpers/split_screen.rb#L9 --- spec/helpers/test_delegate.rb | 5 ----- spec/split_screen_in_tab_bar_spec.rb | 6 +++++- spec/split_screen_open_screen_spec.rb | 6 +++++- spec/split_screen_spec.rb | 6 +++++- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/spec/helpers/test_delegate.rb b/spec/helpers/test_delegate.rb index 989783b..becdf95 100644 --- a/spec/helpers/test_delegate.rb +++ b/spec/helpers/test_delegate.rb @@ -1,9 +1,4 @@ class TestDelegate < ProMotion::Delegate def on_load(app, options) end - - # Hack to make RM 2.0 work. - # Ref: http://hipbyte.myjetbrains.com/youtrack/issue/RM-136 - def dealloc - end end diff --git a/spec/split_screen_in_tab_bar_spec.rb b/spec/split_screen_in_tab_bar_spec.rb index 2661351..c21515d 100644 --- a/spec/split_screen_in_tab_bar_spec.rb +++ b/spec/split_screen_in_tab_bar_spec.rb @@ -10,6 +10,10 @@ describe "split screen in tab bar functionality" do @tab = @app.open_tab_bar @split_screen, HomeScreen, BasicScreen end + after do + @split_screen.delegate = nil # dereference to avoid memory issue + end + it "should create a UISplitViewController" do @split_screen.is_a?(UISplitViewController).should == true end @@ -46,4 +50,4 @@ describe "split screen in tab bar functionality" do @tab.viewControllers.first.should == @split_screen end -end \ No newline at end of file +end diff --git a/spec/split_screen_open_screen_spec.rb b/spec/split_screen_open_screen_spec.rb index 0f6ecf1..10bbdb5 100644 --- a/spec/split_screen_open_screen_spec.rb +++ b/spec/split_screen_open_screen_spec.rb @@ -10,6 +10,10 @@ describe "split screen `open` functionality" do @split_screen = @app.open_split_screen @master_screen, @detail_screen_1 end + after do + @split_screen.delegate = nil # dereference to avoid memory issue + end + it "should open a new screen in the detail view" do @master_screen.open @detail_screen_2, in_detail: true @split_screen.detail_screen.should == @detail_screen_2 @@ -43,4 +47,4 @@ describe "split screen `open` functionality" do home.navigation_controller.topViewController.should == child end -end \ No newline at end of file +end diff --git a/spec/split_screen_spec.rb b/spec/split_screen_spec.rb index 2fd506a..59744b3 100644 --- a/spec/split_screen_spec.rb +++ b/spec/split_screen_spec.rb @@ -9,6 +9,10 @@ describe "split screen functionality" do @split_screen = @app.open_split_screen @master_screen, @detail_screen end + after do + @split_screen.delegate = nil # dereference to avoid memory issue + end + it "should have created a split screen" do @split_screen.should != nil @split_screen.is_a?(UISplitViewController).should == true @@ -32,4 +36,4 @@ describe "split screen functionality" do @split_screen.viewControllers.last.should == @detail_screen.main_controller end -end \ No newline at end of file +end