Skip to content

Commit

Permalink
require calabash-common and bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
krukow committed May 14, 2013
1 parent bbf65ad commit a9421ac
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
3 changes: 2 additions & 1 deletion calabash-cucumber/calabash-cucumber.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ Gem::Specification.new do |s|
s.executables = "calabash-ios"
s.require_paths = ["lib"]

s.add_dependency( "cucumber" )
s.add_dependency( "cucumber", "~> 1.3.0" )
s.add_dependency( "calabash-common", "~> 0.0.1" )
s.add_dependency( "json" )
s.add_dependency( "CFPropertyList" )
s.add_dependency( "sim_launcher", "0.4.6")
Expand Down
4 changes: 2 additions & 2 deletions calabash-cucumber/lib/calabash-cucumber/version.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module Calabash
module Cucumber
VERSION = '0.9.145.pre3'
FRAMEWORK_VERSION = '0.9.145.pre3'
VERSION = '0.9.145.pre4'
FRAMEWORK_VERSION = '0.9.145.pre4'
end
end
10 changes: 9 additions & 1 deletion calabash-cucumber/scripts/launch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
# However the recommended approach is to let Calabash find the app itself
# or set the environment variable APP_BUNDLE_PATH


Before do |scenario|
@calabash_launcher = Calabash::Cucumber::Launcher.new
unless @calabash_launcher.calabash_no_launch?
Expand All @@ -37,4 +38,11 @@
@calabash_launcher.stop
end
end
end
end

at_exit do
launcher = Calabash::Cucumber::Launcher.new
if launcher.simulator_target?
Calabash::Cucumber::SimulatorHelper.stop unless launcher.calabash_no_stop?
end
end

0 comments on commit a9421ac

Please sign in to comment.