Skip to content

Commit

Permalink
Merge pull request #17 from G5/rails_7
Browse files Browse the repository at this point in the history
Rails 7
  • Loading branch information
Matt-Bishop authored Jan 30, 2025
2 parents 3a6a575 + 8de3bba commit e377dd8
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 10 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
# Change Log
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## [1.3.4]
### Added
- rails 7 compatibility



## [1.3.3]
### Added
Expand Down
4 changes: 2 additions & 2 deletions asyncapi_server.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ Gem::Specification.new do |s|

s.add_dependency "kaminari"
s.add_dependency "api-pagination"
s.add_dependency "rails", "6.1.7.1"
s.add_dependency "rails", ">= 6.1.7.1"
s.add_dependency "active_model_serializers", "~> 0.9.7"
s.add_dependency "typhoeus"
s.add_dependency "sidekiq"
s.add_dependency "responders"
s.add_dependency "ar_after_transaction"

s.add_development_dependency "sqlite3", ">= 1.4"
s.add_development_dependency "sqlite3", "1.4.4"
s.add_development_dependency "rspec-rails"
s.add_development_dependency "rspec-its"
s.add_development_dependency "rspec-sidekiq"
Expand Down
2 changes: 1 addition & 1 deletion lib/asyncapi/server/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Asyncapi
module Server
VERSION = "1.3.3"
VERSION = "1.3.4"
end
end
2 changes: 1 addition & 1 deletion spec/dummy/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
require "action_controller/railtie"
require "action_mailer/railtie"
require "action_view/railtie"
require "sprockets/railtie"
# require "sprockets/railtie"
# require "rails/test_unit/railtie"

Bundler.require(*Rails.groups)
Expand Down
4 changes: 2 additions & 2 deletions spec/dummy/config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
# Debug mode disables concatenation and preprocessing of assets.
# This option may cause significant delays in view rendering with a large
# number of complex assets.
config.assets.debug = true
# config.assets.debug = true

# Adds additional error checking when serving assets at runtime.
# Checks for improperly declared sprockets dependencies.
# Raises helpful error messages.
config.assets.raise_runtime_errors = true
# config.assets.raise_runtime_errors = true

# Raises error for missing translations
# config.action_view.raise_on_missing_translations = true
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/config/initializers/assets.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Be sure to restart your server when you modify this file.

# Version of your assets, change this if you want to expire all your assets.
Rails.application.config.assets.version = '1.0'
# Rails.application.config.assets.version = '1.0'

# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
Expand Down
3 changes: 1 addition & 2 deletions spec/dummy/db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2015_02_01_231018) do

ActiveRecord::Schema[7.1].define(version: 2015_02_01_231018) do
create_table "asyncapi_server_jobs", force: :cascade do |t|
t.integer "status"
t.string "callback_url"
Expand Down
2 changes: 1 addition & 1 deletion spec/requests/enqueueing_jobs_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
expect(response).to be_successful
parsed_response = indifferent_hash(response.body)[:job]
expect(Asyncapi::Server::JobWorker).
to have_enqueued_job(parsed_response[:id])
to have_enqueued_sidekiq_job(parsed_response[:id])
expect(parsed_response[:url]).to be_present
expect(parsed_response[:secret]).to eq "secret"
end
Expand Down

0 comments on commit e377dd8

Please sign in to comment.