Skip to content

Commit

Permalink
Test puma on Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
siaw23-retired committed Mar 2, 2019
1 parent 056e7b4 commit fcdfd41
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 10 deletions.
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ gem 'mailman', require: false
# To convert html to markdown
gem 'reverse_markdown'
# gem 'mysql2', '>= 0.4.4'
gem 'puma', '~> 3.12'

# run with `bundle install --without production` or `bundle install --without mysql` to exclude this
group :mysql, :production do
Expand Down Expand Up @@ -96,7 +97,7 @@ group :development do
end

group :test, :development do
gem 'puma', '~> 3.12'
# gem 'puma', '~> 3.12'
gem 'capybara'
gem 'ci_reporter_test_unit'
gem 'coveralls', require: false
Expand All @@ -119,5 +120,5 @@ end

group :production do
gem "scrypt", "~> 3"
gem 'passenger'
# gem 'passenger'
end
4 changes: 0 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,6 @@ GEM
parallel (1.13.0)
parser (2.6.0.0)
ast (~> 2.4.0)
passenger (6.0.1)
rack
rake (>= 0.8.1)
phantomjs (2.1.1.0)
php-serialize (1.2.0)
power_assert (1.1.3)
Expand Down Expand Up @@ -547,7 +544,6 @@ DEPENDENCIES
omniauth-twitter
openssl (~> 2.1.2)
paperclip (~> 6.1.0)
passenger
phantomjs
php-serialize
progress_bar
Expand Down
4 changes: 0 additions & 4 deletions test/application_system_test_case.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,4 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase

Selenium::WebDriver::Chrome::Options.new.add_argument(argument)

if Rails.env.production?
Capybara.run_server = false
Capybara.app_host = "http://0.0.0.0:3000/"
end
end

0 comments on commit fcdfd41

Please sign in to comment.