Skip to content

Commit 92d204c

Browse files
authored
Merge pull request #24 from fastruby/add-support-for-rails-7-2
FR-613 Add Rails 7.2 support
2 parents 191ace1 + f8c9652 commit 92d204c

File tree

10 files changed

+48
-6
lines changed

10 files changed

+48
-6
lines changed

.github/workflows/tests.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Tests
2+
3+
on:
4+
push:
5+
branches: [ '**' ]
6+
7+
jobs:
8+
test:
9+
runs-on: ubuntu-latest
10+
strategy:
11+
matrix:
12+
ruby-version: ['3.2', '3.1', '3.0']
13+
14+
steps:
15+
- uses: actions/checkout@v3
16+
17+
- name: Set up Ruby
18+
uses: ruby/setup-ruby@v1
19+
with:
20+
ruby-version: ${{ matrix.ruby-version }}
21+
bundler-cache: true
22+
23+
- name: Install dependencies
24+
run: bundle install
25+
26+
- name: Run tests
27+
run: bundle exec rake

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
/test/dummy/log/*.log
77
/test/dummy/storage/
88
/test/dummy/tmp/
9-
Gemfile.lock
9+
/test/dummy/dummy_test*
10+
Gemfile.lock

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1414

1515
## main [(unreleased)](https://github.com/fastruby/ombu_labs-auth/compare/6efa57eda3bd3f93e0f245342eb2a317574c32ff...main)
1616

17-
* [BUGFIX: Resolve Github Omniauth dependency](https://github.com/fastruby/ombu_labs-auth/pull/19)
17+
* [FEATURE: Add Rails 7.2 compatibility](https://github.com/fastruby/ombu_labs-auth/pull/24)
1818

1919
## 1.0.0 (2023-06-09)
2020

Rakefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,12 @@ load "rails/tasks/engine.rake"
66
load "rails/tasks/statistics.rake"
77

88
require "bundler/gem_tasks"
9+
10+
require 'rake/testtask'
11+
12+
Rake::TestTask.new(:test) do |t|
13+
t.libs << 'test'
14+
t.pattern = 'test/**/*_test.rb'
15+
end
16+
17+
task default: :test

lib/ombu_labs/auth/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module OmbuLabs
22
module Auth
3-
VERSION = "1.0.0"
3+
VERSION = "1.1.0"
44
end
55
end

ombu_labs-auth.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ Gem::Specification.new do |spec|
1919
Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md"]
2020
end
2121

22-
spec.add_dependency "rails", ">= 6.0"
23-
spec.add_dependency "devise", "~> 4.8.1"
22+
spec.add_dependency "rails", ">= 6.0", "< 7.3"
23+
spec.add_dependency "devise", "~> 4.9"
2424
spec.add_dependency "omniauth", "~> 2.1.0"
2525
spec.add_dependency "omniauth-github", "~> 2.0.0"
2626
spec.add_dependency "omniauth-rails_csrf_protection"

test/controllers/callbacks_controller_test.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
require "test_helper"
2+
13
class CallbacksControllerTest < ActionDispatch::IntegrationTest
24
GITHUB_INFO = {
35
"id" => "12345",
@@ -67,4 +69,4 @@ def organization_members
6769
assert_equal "This application is only available to members of my_org.", flash[:error]
6870
end
6971
end
70-
end
72+
end

test/dummy/config/environments/test.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
# Raises error for missing translations.
5656
# config.i18n.raise_on_missing_translations = true
5757

58+
# Allow any host in the test environment
59+
config.hosts.clear
60+
5861
# Annotate rendered view with file names.
5962
# config.action_view.annotate_rendered_view_with_filenames = true
6063
end

test/dummy/dummy_development

-28 KB
Binary file not shown.

test/dummy/dummy_test

Whitespace-only changes.

0 commit comments

Comments
 (0)