Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2
ruby-version: 3.4

- name: Set up Node.js
uses: actions/setup-node@v1
with:
node-version: 18
node-version: 22

# Dependencies

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable-workflow-rspec.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ jobs:
fail-fast: false
matrix:
include:
- ruby-version: 3.2
- ruby-version: 3.2
- ruby-version: 3.4
- ruby-version: 3.4
rails-version: "~> 7.2"

env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/storybook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ jobs:

# Ruby/Node

- name: Set up Ruby 3.2
- name: Set up Ruby 3.4
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2
ruby-version: 3.4

- name: Set up Node.js 18
- name: Set up Node.js 22
uses: actions/setup-node@v1
with:
node-version: 18
node-version: 22

# Dependencies

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,34 +25,34 @@ jobs:
include:
- job: pageflow
engine-name: pageflow
ruby-version: 3.2
ruby-version: 3.4
engine-directory: .
rspec-command: bin/rspec --tag ~js
install-audiowaveform: true

- job: pageflow_js
engine-name: pageflow
ruby-version: 3.2
ruby-version: 3.4
engine-directory: .
rspec-command: bin/rspec-with-retry --tag js

- job: pageflow_paged
engine-name: pageflow_paged
ruby-version: 3.2
ruby-version: 3.4
engine-directory: entry_types/paged
plugin-name: pageflow_paged
rspec-command: bin/rspec

- job: pageflow_scrolled
engine-name: pageflow_scrolled
ruby-version: 3.2
ruby-version: 3.4
engine-directory: entry_types/scrolled
plugin-name: pageflow_scrolled
rspec-command: bin/rspec --tag ~js

- job: pageflow_scrolled_js
engine-name: pageflow_scrolled
ruby-version: 3.2
ruby-version: 3.4
engine-directory: entry_types/scrolled
plugin-name: pageflow_scrolled
rspec-command: bin/rspec-with-retry-on-timeout --tag js
Expand Down Expand Up @@ -112,10 +112,10 @@ jobs:
with:
ruby-version: ${{ matrix.ruby-version }}

- name: Use Node.js 18
- name: Use Node.js 22
uses: actions/setup-node@v1
with:
node-version: 18
node-version: 22

# Dependencies

Expand Down Expand Up @@ -200,10 +200,10 @@ jobs:
restore-keys: |
${{ runner.os }}-yarn-

- name: Set up Node.js 18
- name: Set up Node.js 22
uses: actions/setup-node@v1
with:
node-version: 18
node-version: 22

- name: Yarn install
run: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ Pageflow assumes the following choice of libraries:

Pageflow runs in environments with:

* Ruby >= 3.2
* Node >= 18
* Ruby >= 3.4
* Node >= 22
* Rails 7.1
* Redis server (for Resque)
* A database server supported by Active Record (tested with MySQL)
Expand Down
2 changes: 1 addition & 1 deletion pageflow.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ Gem::Specification.new do |s|
s.add_development_dependency 'domino', '~> 0.7.0'

# Fixture replacement
s.add_development_dependency 'factory_bot_rails', '~> 4.8'
s.add_development_dependency 'factory_bot_rails', '~> 6.5'

# Matchers for Pundit policies
s.add_development_dependency 'pundit-matchers', '~> 1.0'
Expand Down
2 changes: 1 addition & 1 deletion spec/models/concerns/pageflow/permalinkable_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
module Pageflow
describe Permalinkable do
it 'accepts permalink attributes on create' do
entry = build(:entry)
entry = create(:entry)
permalink_directory = create(:permalink_directory, site: entry.site)
entry.update!(permalink_attributes: {
slug: 'some-slug',
Expand Down
2 changes: 1 addition & 1 deletion spec/support/pageflow-support.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Gem::Specification.new do |s|
s.add_dependency 'pageflow', Pageflow::VERSION

s.add_dependency 'domino', '~> 0.7.0'
s.add_dependency 'factory_bot_rails', '~> 4.8'
s.add_dependency 'factory_bot_rails', '~> 6.5'

s.add_dependency 'bootsnap', '~> 1.0'
s.add_dependency 'listen', '~> 3.0'
Expand Down
Loading