Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump tailwindcss-rails from 2.0.29 to 2.0.30 #308

Merged
merged 4 commits into from
Aug 27, 2023
Merged

Bump tailwindcss-rails from 2.0.29 to 2.0.30 #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71c901c
Bump tailwindcss-rails from 2.0.29 to 2.0.30
dependabot[bot] Aug 1, 2023
40233ee
Merge branch 'develop' into dependabot/bundler/tailwindcss-rails-2.0.30
jcowhigjr Aug 26, 2023
dc771a2
What: tailwindcss-rails 2.0.30 brought a dom testing gem. This gem h…
jcowhigjr Aug 27, 2023
6052930
rubocop fixes
jcowhigjr Aug 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ GEM
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
mini_mime (1.1.2)
minitest (5.18.1)
minitest (5.19.0)
minitest-focus (1.4.0)
minitest (>= 4, < 6)
minitest-retry (0.2.2)
Expand Down Expand Up @@ -312,7 +312,7 @@ GEM
puma (6.3.1)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.7)
rack (2.2.8)
rack-brotli (1.2.0)
brotli (>= 0.1.7)
rack (>= 1.4)
Expand All @@ -338,8 +338,9 @@ GEM
activesupport (= 7.0.6)
bundler (>= 1.15.0)
railties (= 7.0.6)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
rails-dom-testing (2.1.1)
activesupport (>= 5.0.0)
minitest
nokogiri (>= 1.6)
rails-html-sanitizer (1.6.0)
loofah (~> 2.21)
Expand Down Expand Up @@ -421,9 +422,9 @@ GEM
prettier_print
rbs
syntax_tree (>= 2.0.1)
tailwindcss-rails (2.0.29-x86_64-darwin)
tailwindcss-rails (2.0.30-x86_64-darwin)
railties (>= 6.0.0)
tailwindcss-rails (2.0.29-x86_64-linux)
tailwindcss-rails (2.0.30-x86_64-linux)
railties (>= 6.0.0)
temple (0.9.1)
terminal-table (3.0.2)
Expand Down Expand Up @@ -460,7 +461,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.8)
zeitwerk (2.6.10)

PLATFORMS
x86_64-darwin-20
Expand Down
2 changes: 0 additions & 2 deletions app/controllers/concerns/locales.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module Locales
extend ActiveSupport::Concern

private

included do
def set_locale(&)
locale =
Expand Down
2 changes: 1 addition & 1 deletion test/controllers/coffeeshops_controller/test_routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class CoffeeshopsController::RoutesTest < ActionController::TestCase
class CoffeeshopsController::RoutesTest < ActionDispatch::IntegrationTest
def test_routes
assert_routing '/', controller: 'searches', action: 'new'
assert_routing '/login', controller: 'sessions', action: 'new'
Expand Down
2 changes: 1 addition & 1 deletion test/controllers/reviews/test_routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class ReviewsController::RoutesTest < ActionController::TestCase
class ReviewsController::RoutesTest < ActionDispatch::IntegrationTest
def test_user_review_routes
assert_routing '/users/1/reviews', controller: 'reviews', action: 'index', user_id: '1'
# assert_routing '/users/1/reviews/new', controller: 'reviews', action: 'new_review'
Expand Down
2 changes: 1 addition & 1 deletion test/controllers/searches_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class SearchesControllerTest < ActionDispatch::IntegrationTest

assert_response :success
assert_select 'h2',
"Top Rated Searches for #{@search.query} near you!",
text: "Top Rated Searches for #{@search.query} near you!",
match: :second
end

Expand Down
2 changes: 1 addition & 1 deletion test/controllers/users/test_routes.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'test_helper'

class UsersController::RoutesTest < ActionController::TestCase
class UsersController::RoutesTest < ActionDispatch::IntegrationTest

def test_user_routes
assert_routing '/users/1', controller: 'users', action: 'show', id: '1'
Expand Down
Loading