Skip to content

Commit

Permalink
swap to released version of Bullet (#1102)
Browse files Browse the repository at this point in the history
* swap to released version

* this test is flaky
  • Loading branch information
epugh authored Dec 1, 2024
1 parent 8154e64 commit 7fc150f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 13 deletions.
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ gem 'vega'
group :development, :test do
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
gem 'debug', platforms: [ :mri, :windows ], require: 'debug/prelude'
# gem 'bullet' not Rails 8 compatible
gem 'bullet', git: 'https://github.com/adiaz04/bullet.git', branch: 'main'
gem 'bullet'
gem 'memory_profiler'
end

Expand Down
14 changes: 4 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
GIT
remote: https://github.com/adiaz04/bullet.git
revision: f4b09256b8151c290f6bf4cd6c7aadd829435128
branch: main
specs:
bullet (7.2.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)

GIT
remote: https://github.com/epugh/angular-rails-templates.git
revision: c45588bec096089e51d84ee3461736f000dff87a
Expand Down Expand Up @@ -121,6 +112,9 @@ GEM
bootsnap (1.18.4)
msgpack (~> 1.2)
builder (3.3.0)
bullet (8.0.0)
activesupport (>= 3.0.0)
uniform_notifier (~> 1.11)
cal-heatmap-rails (3.6.2)
capybara (3.40.0)
addressable
Expand Down Expand Up @@ -548,7 +542,7 @@ DEPENDENCIES
apipie-rails (~> 1.2)
bcrypt (~> 3.1.7)
bootsnap
bullet!
bullet
cal-heatmap-rails (~> 3.6)
capybara
colorize
Expand Down
2 changes: 1 addition & 1 deletion test/controllers/api/v1/bulk/queries_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class QueriesControllerTest < ActionController::TestCase
post :create, params: data
end

assert result.real < 5, "Expecting less than 5 seconds. Elapsed time: #{result.real} seconds\n"
assert result.real < 8, "Expecting less than 8 seconds. Elapsed time: #{result.real} seconds\n"
# puts "Elapsed time: #{result.real} seconds\n"

acase.reload
Expand Down

0 comments on commit 7fc150f

Please sign in to comment.