Skip to content

Commit

Permalink
run tests with bundler since that is what our users run
Browse files Browse the repository at this point in the history
  • Loading branch information
grosser committed Jun 4, 2017
1 parent 4af4a00 commit b72251b
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion test/test_integration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ def teardown
end

def server(argv)
cmd = "#{Gem.ruby} -Ilib bin/puma -b tcp://127.0.0.1:#{@tcp_port} #{argv}"
# when we were started with bundler all load-paths and bin-paths are setup correctly
# this is what 9X% of users run, so it is what we should test
# the other case is solely for package builders or testing 1-off cases where the system puma is used
base = (defined?(Bundler) ? "bundle exec puma" : "#{Gem.ruby} -Ilib bin/puma")
cmd = "#{base} -b tcp://127.0.0.1:#{@tcp_port} #{argv}"
@server = IO.popen(cmd, "r")

wait_for_server_to_boot
Expand Down

0 comments on commit b72251b

Please sign in to comment.