Permalink
Browse files

Merge remote-tracking branch 'origin/master' into 1.3.x

  • Loading branch information...
2 parents a430748 + 51f4418 commit 08093aa425ebf4ef53ed9850bc6749ea13d468bb @TrevorBramble TrevorBramble committed Mar 25, 2012
Showing with 4 additions and 4 deletions.
  1. +4 −4 spec/reloader_spec.rb
View
8 spec/reloader_spec.rb
@@ -11,14 +11,14 @@ def tmp_dir
# Returns the path of the Sinatra application file created by
# +setup_example_app+.
def app_file_path
- File.join(tmp_dir, "example_app_#{@@example_app_counter}.rb")
+ File.join(tmp_dir, "example_app_#{$example_app_counter}.rb")
end
# Returns the name of the Sinatra application created by
# +setup_example_app+: 'ExampleApp1' for the first application,
# 'ExampleApp2' fo the second one, and so on...
def app_name
- "ExampleApp#{@@example_app_counter}"
+ "ExampleApp#{$example_app_counter}"
end
# Returns the (constant of the) Sinatra application created by
@@ -70,8 +70,8 @@ def update_file(path, &block)
# the new application as the one being tested and enables the
# reloader.
def setup_example_app(options={})
- @@example_app_counter ||= 0
- @@example_app_counter += 1
+ $example_app_counter ||= 0
+ $example_app_counter += 1
FileUtils.mkdir_p(tmp_dir)
write_app_file(options)

0 comments on commit 08093aa

Please sign in to comment.