Skip to content

Commit

Permalink
Merge pull request #1194 from alphagov/remove-cuke
Browse files Browse the repository at this point in the history
Remove Cucumber gems, configuration, and tests
  • Loading branch information
csutter authored Apr 25, 2024
2 parents 1f365cc + 8ee29d5 commit e30f563
Show file tree
Hide file tree
Showing 18 changed files with 18 additions and 465 deletions.
41 changes: 2 additions & 39 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
contents: read
security-events: write
actions: read

codeql-sast:
name: CodeQL SAST scan
uses: alphagov/govuk-infrastructure/.github/workflows/codeql-analysis.yml@main
Expand All @@ -29,7 +29,7 @@ jobs:
dependency-review:
name: Dependency Review scan
uses: alphagov/govuk-infrastructure/.github/workflows/dependency-review.yml@main

security-analysis:
name: Security Analysis
uses: alphagov/govuk-infrastructure/.github/workflows/brakeman.yml@main
Expand Down Expand Up @@ -58,40 +58,3 @@ jobs:
test-ruby:
name: Test Ruby
uses: ./.github/workflows/rspec.yml

integration-tests:
name: Integration tests
runs-on: ubuntu-latest
steps:
- name: Setup MySQL
id: setup-mysql
uses: alphagov/govuk-infrastructure/.github/actions/setup-mysql@main

- name: Setup Redis
uses: alphagov/govuk-infrastructure/.github/actions/setup-redis@main

- name: Checkout repository
uses: actions/checkout@v3

- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
bundler-cache: true

- name: Setup Node
uses: alphagov/govuk-infrastructure/.github/actions/setup-node@main

- name: Precompile assets
uses: alphagov/govuk-infrastructure/.github/actions/precompile-rails-assets@main

- name: Initialize database
env:
RAILS_ENV: test
TEST_DATABASE_URL: ${{ steps.setup-mysql.outputs.db-url }}
run: bundle exec rails db:setup

- name: Run cucumber
env:
RAILS_ENV: test
TEST_DATABASE_URL: ${{ steps.setup-mysql.outputs.db-url }}
run: bundle exec rails cucumber
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,9 @@ group :development do
end

group :test do
gem "brakeman"
gem "cucumber-rails", require: false
gem "database_cleaner"
gem "factory_bot_rails"
gem "govuk_schemas"
gem "govuk_test"
gem "simplecov"
gem "webmock"
end
Expand Down
56 changes: 14 additions & 42 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -107,44 +107,9 @@ GEM
bigdecimal
rexml
crass (1.0.6)
cucumber (9.2.0)
builder (~> 3.2)
cucumber-ci-environment (> 9, < 11)
cucumber-core (> 13, < 14)
cucumber-cucumber-expressions (~> 17.0)
cucumber-gherkin (> 24, < 28)
cucumber-html-formatter (> 20.3, < 22)
cucumber-messages (> 19, < 25)
diff-lcs (~> 1.5)
mini_mime (~> 1.1)
multi_test (~> 1.1)
sys-uname (~> 1.2)
cucumber-ci-environment (10.0.1)
cucumber-core (13.0.2)
cucumber-gherkin (>= 27, < 28)
cucumber-messages (>= 20, < 23)
cucumber-tag-expressions (> 5, < 7)
cucumber-cucumber-expressions (17.1.0)
bigdecimal
cucumber-gherkin (27.0.0)
cucumber-messages (>= 19.1.4, < 23)
cucumber-html-formatter (21.3.1)
cucumber-messages (> 19, < 25)
cucumber-messages (22.0.0)
cucumber-rails (3.0.0)
capybara (>= 3.11, < 4)
cucumber (>= 5, < 10)
railties (>= 5.2, < 8)
cucumber-tag-expressions (6.1.0)
dartsass-rails (0.5.0)
railties (>= 6.0.0)
sass-embedded (~> 1.63)
database_cleaner (2.0.2)
database_cleaner-active_record (>= 2, < 3)
database_cleaner-active_record (2.1.0)
activerecord (>= 5.a)
database_cleaner-core (~> 2.0.0)
database_cleaner-core (2.0.1)
date (3.3.4)
diff-lcs (1.5.1)
docile (1.4.0)
Expand Down Expand Up @@ -219,6 +184,11 @@ GEM
govuk_app_config (>= 1.1)
redis-namespace (~> 1.6)
sidekiq (~> 6.5, >= 6.5.12)
govuk_test (4.0.2)
brakeman (>= 5.0.2)
capybara (>= 3.36)
puma
selenium-webdriver (>= 4.0)
hashdiff (1.1.0)
hashie (5.0.0)
http-accept (1.7.0)
Expand Down Expand Up @@ -274,7 +244,6 @@ GEM
mini_portile2 (2.8.6)
minitest (5.22.3)
msgpack (1.7.2)
multi_test (1.1.0)
multi_xml (0.6.0)
mutex_m (0.2.0)
mysql2 (0.5.6)
Expand Down Expand Up @@ -590,7 +559,7 @@ GEM
redis-namespace (1.11.0)
redis (>= 4)
regexp_parser (2.9.0)
reline (0.5.2)
reline (0.5.3)
io-console (~> 0.5)
request_store (1.6.0)
rack (>= 1.4)
Expand Down Expand Up @@ -656,11 +625,17 @@ GEM
rubocop-rspec_rails (2.28.2)
rubocop (~> 1.40)
ruby-progressbar (1.13.0)
rubyzip (2.3.2)
sass-embedded (1.75.0)
google-protobuf (>= 3.25, < 5.0)
rake (>= 13.0.0)
sassc (2.4.0)
ffi (~> 1.9)
selenium-webdriver (4.19.0)
base64 (~> 0.2)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
sentry-rails (5.17.3)
railties (>= 5.0)
sentry-ruby (~> 5.17.3)
Expand Down Expand Up @@ -692,8 +667,6 @@ GEM
sprockets (>= 3.0.0)
statsd-ruby (1.5.0)
stringio (3.1.0)
sys-uname (1.2.3)
ffi (~> 1.1)
thor (1.3.1)
timeout (0.4.1)
tzinfo (2.0.6)
Expand All @@ -710,6 +683,7 @@ GEM
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
websocket (1.2.10)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand All @@ -722,10 +696,7 @@ PLATFORMS

DEPENDENCIES
bootsnap
brakeman
cucumber-rails
dartsass-rails
database_cleaner
factory_bot_rails
foreman
gds-api-adapters
Expand All @@ -735,6 +706,7 @@ DEPENDENCIES
govuk_publishing_components
govuk_schemas
govuk_sidekiq
govuk_test
listen
mail-notify
mysql2
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ require File.expand_path("config/application", __dir__)
Rails.application.load_tasks

Rake::Task[:default].clear if Rake::Task.task_defined?(:default)
task default: %i[lint spec cucumber]
task default: %i[lint spec]
8 changes: 0 additions & 8 deletions config/cucumber.yml

This file was deleted.

3 changes: 0 additions & 3 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ test: &test
password: search_admin
url: <%= ENV["TEST_DATABASE_URL"]%>

cucumber:
<<: *test

production:
<<: *default
url: <%= ENV['DATABASE_URL'] %>
8 changes: 0 additions & 8 deletions features/navigation.feature

This file was deleted.

27 changes: 0 additions & 27 deletions features/recommended_links.feature

This file was deleted.

9 changes: 0 additions & 9 deletions features/recommended_links_csv.feature

This file was deleted.

25 changes: 0 additions & 25 deletions features/step_definitions/navigation_steps.rb

This file was deleted.

9 changes: 0 additions & 9 deletions features/step_definitions/recommended_links_csv_steps.rb

This file was deleted.

58 changes: 0 additions & 58 deletions features/step_definitions/recommended_links_steps.rb

This file was deleted.

This file was deleted.

Loading

0 comments on commit e30f563

Please sign in to comment.