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

Rails 7.1 updates #36

Merged
merged 15 commits into from
May 31, 2024
Merged

Rails 7.1 updates #36

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8515be8
updates to gemfile
bpurinton May 30, 2024
df9bb34
bundle update
bpurinton May 30, 2024
012ffa0
remove original dbs
bpurinton May 30, 2024
4614bbb
updates to envs
bpurinton May 30, 2024
faa6cc6
tmp - use testing docker image
bpurinton May 30, 2024
2f69a19
remove deprecated rspec option
bpurinton May 30, 2024
47ae4f5
devise deprecated option patch
bpurinton May 30, 2024
9d2f136
update docker image
bpurinton May 30, 2024
3bd1941
updates from bin/rails app:update
bpurinton May 30, 2024
4ff284b
run bin/setup
bpurinton May 30, 2024
c29c338
remove web_git
bpurinton May 30, 2024
cc809c0
comment out force_ssl
bpurinton May 30, 2024
a66e7fd
delete db changes
bpurinton May 30, 2024
da4dc91
update readme
bpurinton May 30, 2024
f8432df
add sqlite dbs
bpurinton May 30, 2024
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
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"name": "Container",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "firstdraft/appdev-rails-template",
"image": "firstdraft/appdev-rails-7-1-template",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
Expand Down
2 changes: 1 addition & 1 deletion .gitpod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: firstdraft/appdev-rails-template
image: firstdraft/appdev-rails-7-1-template

tasks:
- before: |
Expand Down
1 change: 0 additions & 1 deletion .rspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
--color
--format documentation
--order default
Copy link
Contributor Author

@bpurinton bpurinton May 30, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This option seemed to have become deprecated and caused rspec to fail (hard to find info about where this happened after awhile searching online!). In any case, the default option is --order defined (see docs), so we don't need to specify it.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this happened in Rspec v3, which is quite old. I'm surprised we didn't notice warnings or issues from the beginning 😅

--require spec_helper
10 changes: 4 additions & 6 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
ruby "3.2.1"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 7.0.4", ">= 7.0.4.3"
gem "rails", "~> 7.1.3", ">= 7.1.3.2"

# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem "sprockets-rails"
Expand All @@ -13,7 +13,7 @@ gem "sprockets-rails"
gem "pg", "~> 1.1"

# Use the Puma web server [https://github.com/puma/puma]
gem "puma", "~> 5.0"
gem "puma"

# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
gem "importmap-rails"
Expand Down Expand Up @@ -75,7 +75,7 @@ end
# ===========
gem "appdev_support"
gem "awesome_print"
gem "devise" # to be removed
gem "devise"
gem "dotenv-rails"
gem "faker"
gem "htmlbeautifier"
Expand All @@ -94,16 +94,14 @@ group :development do
gem "rails-erd"
gem "rufo"
gem "specs_to_readme"
gem "web_git"
end

group :development, :test do
gem "rspec-rails", "~> 6.0.0"
end

group :test do
gem "draft_matchers"#, "0.0.2"#path: "../../my_stuff/draft_matchers"
# gem "draft_matchers"
gem "draft_matchers"
gem "rspec-html-matchers"
gem "webmock"
end
Loading