Skip to content

Bump ember-cli-rails from c58ece9 to 93502ea #1

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.

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

Open
wants to merge 13 commits into
base: trunk
Choose a base branch
from
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,21 @@ jobs:
ruby-version: .ruby-version
bundler-cache: true

- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 18
cache: 'npm'
cache-dependency-path: frontend/package-lock.json
- run: cd frontend && npm ci

- name: Run tests
env:
RAILS_ENV: test
DATABASE_URL: postgres://postgres:postgres@localhost:5432
CI: 'true'
# REDIS_URL: redis://localhost:6379/0
run: bin/rails db:test:prepare test test:system
run: bin/rails db:test:prepare && bin/rspec

- name: Keep screenshots from failed system tests
uses: actions/upload-artifact@v4
Expand Down
4 changes: 4 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,7 @@ inherit_gem: { rubocop-rails-omakase: rubocop.yml }
# # Use `[a, [b, c]]` not `[ a, [ b, c ] ]`
# Layout/SpaceInsideArrayLiteralBrackets:
# Enabled: false
AllCops:
Exclude:
- 'frontend/**/*'
- 'vendor/**/*'
5 changes: 2 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,13 @@ group :development, :test do
gem "rspec-rails", "~> 7.1"
gem "factory_bot_rails"
gem "faker"

gem "pry-rails"
end

group :development do
# Use console on exceptions pages [https://github.com/rails/web-console]
gem "web-console"

# Highlight the fine-grained location where an error occurred [https://github.com/ruby/error_highlight]
gem "error_highlight", ">= 0.4.0", platforms: [ :ruby ]
end

group :test do
Expand Down
36 changes: 23 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/tricknotes/ember-cli-rails.git
revision: c58ece99846fb94a311fd2f0aca5165e0615d923
revision: 93502eade30e1d03f249b88ddddeaed70d264ed1
branch: main
specs:
ember-cli-rails (0.12.2)
Expand Down Expand Up @@ -107,8 +107,9 @@ GEM
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
climate_control (0.2.0)
concurrent-ruby (1.3.4)
connection_pool (2.4.1)
coderay (1.1.3)
concurrent-ruby (1.3.5)
connection_pool (2.5.0)
crass (1.0.6)
date (3.4.1)
debug (1.10.0)
Expand All @@ -124,7 +125,6 @@ GEM
drb (2.2.1)
ember-cli-rails-assets (0.7.1)
nokogiri
error_highlight (0.7.0)
erubi (1.13.1)
factory_bot (6.5.0)
activesupport (>= 5.0.0)
Expand All @@ -136,22 +136,23 @@ GEM
globalid (1.2.1)
activesupport (>= 6.1)
html_page (0.1.0)
i18n (1.14.6)
i18n (1.14.7)
concurrent-ruby (~> 1.0)
importmap-rails (2.1.0)
actionpack (>= 6.0.0)
activesupport (>= 6.0.0)
railties (>= 6.0.0)
io-console (0.8.0)
irb (1.14.3)
irb (1.15.0)
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jbuilder (2.13.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
json (2.9.1)
language_server-protocol (3.17.0.3)
logger (1.6.4)
logger (1.6.5)
loofah (2.24.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -162,6 +163,7 @@ GEM
net-smtp
marcel (1.0.4)
matrix (0.4.2)
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.25.4)
msgpack (1.7.5)
Expand All @@ -175,19 +177,27 @@ GEM
net-smtp (0.5.0)
net-protocol
nio4r (2.7.4)
nokogiri (1.18.1-aarch64-linux-gnu)
nokogiri (1.18.2-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.1-arm64-darwin)
nokogiri (1.18.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.1-x86_64-linux-gnu)
nokogiri (1.18.2-x86_64-linux-gnu)
racc (~> 1.4)
orm_adapter (0.5.0)
parallel (1.26.3)
parser (3.3.6.0)
ast (~> 2.4.1)
racc
pg (1.5.9)
psych (5.2.2)
pp (0.6.2)
prettyprint
prettyprint (0.2.0)
pry (0.15.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry-rails (0.3.11)
pry (>= 0.13.0)
psych (5.2.3)
date
stringio
public_suffix (6.0.1)
Expand Down Expand Up @@ -233,7 +243,7 @@ GEM
zeitwerk (~> 2.6)
rainbow (3.1.1)
rake (13.2.1)
rdoc (6.10.0)
rdoc (6.11.0)
psych (>= 4.0.0)
regexp_parser (2.10.0)
reline (0.6.0)
Expand Down Expand Up @@ -342,12 +352,12 @@ DEPENDENCIES
debug
devise (~> 4.9)
ember-cli-rails!
error_highlight (>= 0.4.0)
factory_bot_rails
faker
importmap-rails
jbuilder
pg (~> 1.1)
pry-rails
puma (>= 5.0)
rails (~> 7.2.2, >= 7.2.2.1)
rspec-rails (~> 7.1)
Expand Down
27 changes: 27 additions & 0 deletions bin/rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/usr/bin/env ruby
# frozen_string_literal: true

#
# This file was generated by Bundler.
#
# The application 'rspec' is installed as part of a gem, and
# this file is here to facilitate running it.
#

ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)

bundle_binstub = File.expand_path("bundle", __dir__)

if File.file?(bundle_binstub)
if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
load(bundle_binstub)
else
abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
end
end

require "rubygems"
require "bundler/setup"

load Gem.bin_path("rspec-core", "rspec")
10 changes: 5 additions & 5 deletions config/initializers/devise.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
# Configure the e-mail address which will be shown in Devise::Mailer,
# note that it will be overwritten if you use your own mailer class
# with default "from" parameter.
config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com'
config.mailer_sender = "please-change-me-at-config-initializers-devise@example.com"

# Configure the class responsible to send e-mails.
# config.mailer = 'Devise::Mailer'
Expand All @@ -36,7 +36,7 @@
# Load and configure the ORM. Supports :active_record (default) and
# :mongoid (bson_ext recommended) by default. Other ORMs may be
# available as additional gems.
require 'devise/orm/active_record'
require "devise/orm/active_record"

# ==> Configuration for any authentication mechanism
# Configure which keys are used when authenticating a user. The default is
Expand All @@ -58,12 +58,12 @@
# Configure which authentication keys should be case-insensitive.
# These keys will be downcased upon creating or modifying a user and when used
# to authenticate or find a user. Default is :email.
config.case_insensitive_keys = [:email]
config.case_insensitive_keys = [ :email ]

# Configure which authentication keys should have whitespace stripped.
# These keys will have whitespace before and after removed upon creating or
# modifying a user and when used to authenticate or find a user. Default is :email.
config.strip_whitespace_keys = [:email]
config.strip_whitespace_keys = [ :email ]

# Tell if authentication through request.params is enabled. True by default.
# It can be set to an array that will enable params authentication only for the
Expand Down Expand Up @@ -97,7 +97,7 @@
# Notice that if you are skipping storage for all authentication paths, you
# may want to disable generating routes to Devise's sessions controller by
# passing skip: :sessions to `devise_for` in your config/routes.rb
config.skip_session_storage = [:http_auth]
config.skip_session_storage = [ :http_auth ]

# By default, Devise cleans up the CSRF token on authentication to
# avoid CSRF token fixation attacks. This means that, when using AJAX
Expand Down
2 changes: 1 addition & 1 deletion spec/support/chrome_helper.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
RSpec.configure do |config|
config.before(:each, type: :system) do
if ENV["CI"] == "true"
driven_by :selenium, using: :headless_chrome, screen_size: [1400, 1400]
driven_by :selenium, using: :headless_chrome, screen_size: [ 1400, 1400 ]
else
driven_by :selenium_chrome
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require 'rails_helper'

RSpec.describe 'New Users', type: :feature do
scenario 'user signs up successfully' do
RSpec.describe 'New Users', type: :system do
scenario 'the homepage loads' do
# Visit the index page
visit root_path
expect(page).to have_content('Recipe Book') # Replace with the actual welcome message
Expand Down
Loading