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
18 changes: 9 additions & 9 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ commands:
type: string
rspec:
type: string
default: ""
default: "latest"
steps:
- run:
working_directory: << parameters.path >>
command: |
if [[ "<< parameters.rspec >>" != "" ]]; then
if [[ "<< parameters.rspec >>" != "latest" ]]; then
sed -i 's/.*gem.*rspec-core.*/gem "rspec-core", "<< parameters.rspec >>"/g' ./Gemfile
echo "Updated RSpec version in Gemfile"
fi
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
- checkout
- run:
command: |
if [[ "<< parameters.rspec >>" != "" ]]; then
if [[ "<< parameters.rspec >>" != "latest" ]]; then
sed -i 's/.*gem.*rspec-core.*/gem "rspec-core", "<< parameters.rspec >>"/g' ./Gemfile
echo "Updated RSpec version in Gemfile"
fi
Expand All @@ -103,7 +103,7 @@ jobs:
ruby --version
bundle exec rspec --version
RSPEC=$(bundle exec rspec --version | grep rspec-core | head -n1 | cut -d " " -f5)
[ $RSPEC != << parameters.rspec >> ] && exit 1 || echo "Correct version of RSpec installed: $RSPEC"
[ "<< parameters.rspec >>" != "latest" ] && [ $RSPEC != << parameters.rspec >> ] && exit 1 || echo "Correct version of RSpec installed: << parameters.rspec >>"
- run: bundle exec rspec spec/integration/runners/queue/rspec_runner_spec.rb

e2e-regular-rspec:
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
ruby --version
bundle exec rspec --version
RSPEC=$(bundle exec rspec --version | grep rspec-core | head -n1 | cut -d " " -f5)
[ $RSPEC != << parameters.rspec >> ] && exit 1 || echo "Correct version of RSpec installed: $RSPEC"
[ "<< parameters.rspec >>" != "latest" ] && [ $RSPEC != << parameters.rspec >> ] && exit 1 || echo "Correct version of RSpec installed: << parameters.rspec >>"
- run:
working_directory: ~/knapsack_pro-ruby/rails-app-with-knapsack_pro
command: bin/rails db:setup
Expand Down Expand Up @@ -239,7 +239,7 @@ jobs:
ruby --version
bundle exec rspec --version
RSPEC=$(bundle exec rspec --version | grep rspec-core | head -n1 | cut -d " " -f5)
[ $RSPEC != << parameters.rspec >> ] && exit 1 || echo "Correct version of RSpec installed: $RSPEC"
[ "<< parameters.rspec >>" != "latest" ] && [ $RSPEC != << parameters.rspec >> ] && exit 1 || echo "Correct version of RSpec installed: << parameters.rspec >>"
- run:
working_directory: ~/knapsack_pro-ruby/rails-app-with-knapsack_pro
command: bin/rails db:setup
Expand Down Expand Up @@ -442,19 +442,19 @@ workflows:
matrix:
parameters:
ruby: ["3.2", "3.3", "3.4"]
rspec: ["3.12.3", "3.13.3"]
rspec: ["3.12.3", "latest"]
- e2e-regular-rspec:
name: e2e-regular__ruby-<< matrix.ruby >>__rspec-<< matrix.rspec >>
matrix:
parameters:
ruby: ["3.2", "3.3", "3.4"]
rspec: ["3.12.3", "3.13.3"]
rspec: ["3.12.3", "latest"]
- e2e-queue-rspec:
name: e2e-queue__ruby-<< matrix.ruby >>__rspec-<< matrix.rspec >>
matrix:
parameters:
ruby: ["3.2", "3.3", "3.4"]
rspec: ["3.12.3", "3.13.3"]
rspec: ["3.12.3", "latest"]
- e2e-regular-minitest:
name: e2e-regular__ruby-<< matrix.ruby >>__minitest
matrix:
Expand Down
2 changes: 1 addition & 1 deletion knapsack_pro.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'ostruct', '>= 0.6.0'
spec.add_development_dependency 'pry', '~> 0'
spec.add_development_dependency 'rspec', '~> 3.0'
spec.add_development_dependency 'rspec-its', '~> 1.3'
spec.add_development_dependency 'rspec-its'
spec.add_development_dependency 'spinach', '>= 0.8'
spec.add_development_dependency 'test-unit', '>= 3.0.0'
spec.add_development_dependency 'timecop', '>= 0.9.9'
Expand Down
4 changes: 2 additions & 2 deletions rails-app-with-knapsack_pro/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ group :test do
gem 'rails-controller-testing'

if ENV['KNAPSACK_PRO_RSPEC_DISABLED'] != 'true'
# gem 'rspec-core'
gem 'rspec-rails'
gem 'rspec_junit_formatter'
gem 'rspec-retry'
# gem 'rspec-core'
gem 'rspec_junit_formatter'
gem 'async-rspec', require: false
end

Expand Down