fixes

.github/workflows/ci.yml

@@ -1,6 +1,10 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
 
 jobs:
   test:

Gemfile

@@ -10,12 +10,14 @@ gem 'rake', '~> 13.1', require: false
 gem 'yard', '~> 0.9', require: false
 
 # Test tools
-gem 'pry', '~> 0.10', group: :development
-gem 'aruba', '~> 1.0.0'
-gem 'rspec', '~> 3.0'
-gem 'cucumber', '~> 2.0'
-gem 'capybara', '~> 2.5.0'
+gem 'aruba'
+gem 'rspec'
+gem 'cucumber'
+gem 'capybara'
+
+# Optional dependencies, included for tests
 gem 'haml', RUBY_VERSION > '3.0' ? '< 7' : '< 6'
 gem 'slim', '>= 3', '< 5'
 gem 'kramdown'
-gem "redcarpet"
+gem 'redcarpet'
+gem 'rack', '< 3'

Rakefile

@@ -2,9 +2,9 @@ require 'bundler/gem_tasks'
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  exempt_tags = ""
-  exempt_tags << "--tags ~@nojava " if RUBY_PLATFORM == "java"
-  t.cucumber_opts = "--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+  exempt_tags = ["--tags 'not @wip'"]
+  exempt_tags << "--tags 'not @nojava'" if RUBY_PLATFORM == "java"
+  t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
 end
 
 task :test => ["cucumber"]

features/support/env.rb

@@ -3,4 +3,3 @@
 require "middleman-core"
 require "middleman-core/step_definitions"
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-syntax')
-