Merge branch 'ft_storyboard_support' of https://github.com/marcisme/RubyMotion into marcisme-ft_storyboard_support

This commit is contained in:
Eloy Duran
2012-07-13 20:54:46 +02:00
5 changed files with 143 additions and 1 deletions

View File

@@ -169,6 +169,12 @@ module Bacon
# * :tab => true
def tests(controller_class, options = {})
@controller_class = controller_class
@options = {
# name of storyboard file in resources directory
:storyboard_name => 'MainStoryboard',
# id of controller as assigned in Xcode
:id => nil
}.merge(options)
extend Bacon::Functional::API
extend Bacon::Functional::ContextExt
end
@@ -213,7 +219,15 @@ module Bacon
attr_accessor :controller
def controller
@controller ||= @controller_class.alloc.init
@controller ||= if @options[:id]
storyboard.instantiateViewControllerWithIdentifier(@options[:id])
else
@controller_class.alloc.init
end
end
def storyboard
@storyboard ||= UIStoryboard.storyboardWithName(@options[:storyboard_name], bundle:nil)
end
end