diff --git a/Gemfile b/Gemfile index 8fa28ccf9..c72ff433b 100644 --- a/Gemfile +++ b/Gemfile @@ -82,7 +82,6 @@ group :test do gem "capybara", "~> 3.29.0" gem "capybara-webmock", "~> 0.5.3" gem "coveralls", "~> 0.8.22", require: false - gem "database_cleaner", "~> 1.7.0" gem "email_spec", "~> 2.2.0" gem "rspec-rails", "~> 3.8" gem "selenium-webdriver", "~> 3.141" @@ -94,6 +93,7 @@ group :development do gem "capistrano-rails", "~> 1.4.0", require: false gem "capistrano3-delayed-job", "~> 1.7.3" gem "capistrano3-puma", "~> 4.0.0" + gem "database_cleaner", "~> 1.7.0" gem "erb_lint", require: false gem "github_changelog_generator", "~> 1.15.0" gem "mdl", "~> 0.5.0", require: false diff --git a/db/dev_seeds.rb b/db/dev_seeds.rb index f3c154b64..a63ccd86d 100644 --- a/db/dev_seeds.rb +++ b/db/dev_seeds.rb @@ -1,5 +1,7 @@ -require "database_cleaner" -DatabaseCleaner.clean_with :truncation +unless Rails.env.test? + require "database_cleaner" + DatabaseCleaner.clean_with :truncation +end @logger = Logger.new(STDOUT) @logger.formatter = proc do |_severity, _datetime, _progname, msg| msg unless @avoid_log diff --git a/spec/lib/tasks/sitemap_spec.rb b/spec/lib/tasks/sitemap_spec.rb index a3f1ad59f..d72bb9061 100644 --- a/spec/lib/tasks/sitemap_spec.rb +++ b/spec/lib/tasks/sitemap_spec.rb @@ -1,6 +1,6 @@ require "rails_helper" -describe "rake sitemap:create", type: :feature do +describe "rake sitemap:create", type: :system do let(:file) { Rails.root.join("public", "sitemap.xml") } before do diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index e8d6b0646..c4756dd02 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -26,10 +26,6 @@ RSpec.configure do |config| end end -Capybara.register_driver :chrome do |app| - Capybara::Selenium::Driver.new(app, browser: :chrome) -end - Capybara.register_driver :headless_chrome do |app| capabilities = Selenium::WebDriver::Remote::Capabilities.chrome( "goog:chromeOptions" => { @@ -44,8 +40,6 @@ Capybara.register_driver :headless_chrome do |app| ) end -Capybara.javascript_driver = :headless_chrome - Capybara.exact = true OmniAuth.config.test_mode = true diff --git a/spec/shared/features/admin_milestoneable.rb b/spec/shared/system/admin_milestoneable.rb similarity index 100% rename from spec/shared/features/admin_milestoneable.rb rename to spec/shared/system/admin_milestoneable.rb diff --git a/spec/shared/features/admin_progressable.rb b/spec/shared/system/admin_progressable.rb similarity index 100% rename from spec/shared/features/admin_progressable.rb rename to spec/shared/system/admin_progressable.rb diff --git a/spec/shared/features/documentable.rb b/spec/shared/system/documentable.rb similarity index 100% rename from spec/shared/features/documentable.rb rename to spec/shared/system/documentable.rb diff --git a/spec/shared/features/followable.rb b/spec/shared/system/followable.rb similarity index 100% rename from spec/shared/features/followable.rb rename to spec/shared/system/followable.rb diff --git a/spec/shared/features/imageable.rb b/spec/shared/system/imageable.rb similarity index 100% rename from spec/shared/features/imageable.rb rename to spec/shared/system/imageable.rb diff --git a/spec/shared/features/mappable.rb b/spec/shared/system/mappable.rb similarity index 100% rename from spec/shared/features/mappable.rb rename to spec/shared/system/mappable.rb diff --git a/spec/shared/features/milestoneable.rb b/spec/shared/system/milestoneable.rb similarity index 100% rename from spec/shared/features/milestoneable.rb rename to spec/shared/system/milestoneable.rb diff --git a/spec/shared/features/nested_documentable.rb b/spec/shared/system/nested_documentable.rb similarity index 100% rename from spec/shared/features/nested_documentable.rb rename to spec/shared/system/nested_documentable.rb diff --git a/spec/shared/features/nested_imageable.rb b/spec/shared/system/nested_imageable.rb similarity index 100% rename from spec/shared/features/nested_imageable.rb rename to spec/shared/system/nested_imageable.rb diff --git a/spec/shared/features/notifiable_in_app.rb b/spec/shared/system/notifiable_in_app.rb similarity index 100% rename from spec/shared/features/notifiable_in_app.rb rename to spec/shared/system/notifiable_in_app.rb diff --git a/spec/shared/features/progressable.rb b/spec/shared/system/progressable.rb similarity index 100% rename from spec/shared/features/progressable.rb rename to spec/shared/system/progressable.rb diff --git a/spec/shared/features/relationable.rb b/spec/shared/system/relationable.rb similarity index 100% rename from spec/shared/features/relationable.rb rename to spec/shared/system/relationable.rb diff --git a/spec/shared/features/remotely_translatable.rb b/spec/shared/system/remotely_translatable.rb similarity index 100% rename from spec/shared/features/remotely_translatable.rb rename to spec/shared/system/remotely_translatable.rb diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ccacaa333..4a1956218 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,4 @@ require "factory_bot_rails" -require "database_cleaner" require "email_spec" require "devise" require "knapsack_pro" @@ -9,7 +8,7 @@ Dir["./spec/support/**/*.rb"].sort.each { |f| require f } Dir["./spec/shared/**/*.rb"].sort.each { |f| require f } RSpec.configure do |config| - config.use_transactional_fixtures = false + config.use_transactional_fixtures = true config.filter_run :focus config.run_all_when_everything_filtered = true @@ -21,29 +20,7 @@ RSpec.configure do |config| config.include(CommonActions) config.include(ActiveSupport::Testing::TimeHelpers) - config.before(:suite) do - DatabaseCleaner.clean_with :truncation - end - - config.before(:suite) do - if config.use_transactional_fixtures? - raise(<<-MSG) - Delete line `config.use_transactional_fixtures = true` from rails_helper.rb - (or set it to false) to prevent uncommitted transactions being used in - JavaScript-dependent specs. - - During testing, the app-under-test that the browser driver connects to - uses a different database connection to the database connection used by - the spec. The app's database connection would not be able to access - uncommitted transaction data setup over the spec's database connection. - MSG - end - - DatabaseCleaner.clean_with(:truncation) - end - config.before do |example| - DatabaseCleaner.strategy = :transaction I18n.locale = :en Globalize.locale = nil Globalize.set_fallbacks_to_all_available_locales @@ -51,20 +28,7 @@ RSpec.configure do |config| Setting["feature.user.skip_verification"] = nil end - config.before(:each, type: :feature) do - # :rack_test driver's Rack app under test shares database connection - # with the specs, so continue to use transaction strategy for speed. - driver_shares_db_connection_with_specs = Capybara.current_driver == :rack_test - - unless driver_shares_db_connection_with_specs - # Driver is probably for an external browser with an app - # under test that does *not* share a database connection with the - # specs, so use truncation strategy. - DatabaseCleaner.strategy = :truncation - end - end - - config.before(:each, type: :feature) do + config.before(:each, type: :system) do Capybara::Webmock.start end @@ -76,20 +40,20 @@ RSpec.configure do |config| page.driver.reset! end - config.before do - DatabaseCleaner.start + config.before(:each, type: :system) do |example| + driven_by :rack_test end - config.append_after do - DatabaseCleaner.clean + config.before(:each, type: :system, js: true) do + driven_by :headless_chrome end - config.before(:each, type: :feature) do + config.before(:each, type: :system) do Bullet.start_request allow(InvisibleCaptcha).to receive(:timestamp_threshold).and_return(0) end - config.after(:each, type: :feature) do + config.after(:each, type: :system) do Bullet.perform_out_of_channel_notifications if Bullet.notification? Bullet.end_request end diff --git a/spec/features/account_spec.rb b/spec/system/account_spec.rb similarity index 100% rename from spec/features/account_spec.rb rename to spec/system/account_spec.rb diff --git a/spec/features/admin/activity_spec.rb b/spec/system/admin/activity_spec.rb similarity index 100% rename from spec/features/admin/activity_spec.rb rename to spec/system/admin/activity_spec.rb diff --git a/spec/features/admin/admin_notifications_spec.rb b/spec/system/admin/admin_notifications_spec.rb similarity index 100% rename from spec/features/admin/admin_notifications_spec.rb rename to spec/system/admin/admin_notifications_spec.rb diff --git a/spec/features/admin/administrators_spec.rb b/spec/system/admin/administrators_spec.rb similarity index 100% rename from spec/features/admin/administrators_spec.rb rename to spec/system/admin/administrators_spec.rb diff --git a/spec/features/admin/audits_spec.rb b/spec/system/admin/audits_spec.rb similarity index 100% rename from spec/features/admin/audits_spec.rb rename to spec/system/admin/audits_spec.rb diff --git a/spec/features/admin/banners_spec.rb b/spec/system/admin/banners_spec.rb similarity index 100% rename from spec/features/admin/banners_spec.rb rename to spec/system/admin/banners_spec.rb diff --git a/spec/features/admin/budget_groups_spec.rb b/spec/system/admin/budget_groups_spec.rb similarity index 100% rename from spec/features/admin/budget_groups_spec.rb rename to spec/system/admin/budget_groups_spec.rb diff --git a/spec/features/admin/budget_headings_spec.rb b/spec/system/admin/budget_headings_spec.rb similarity index 100% rename from spec/features/admin/budget_headings_spec.rb rename to spec/system/admin/budget_headings_spec.rb diff --git a/spec/features/admin/budget_investments_spec.rb b/spec/system/admin/budget_investments_spec.rb similarity index 100% rename from spec/features/admin/budget_investments_spec.rb rename to spec/system/admin/budget_investments_spec.rb diff --git a/spec/features/admin/budget_phases_spec.rb b/spec/system/admin/budget_phases_spec.rb similarity index 100% rename from spec/features/admin/budget_phases_spec.rb rename to spec/system/admin/budget_phases_spec.rb diff --git a/spec/features/admin/budgets_spec.rb b/spec/system/admin/budgets_spec.rb similarity index 100% rename from spec/features/admin/budgets_spec.rb rename to spec/system/admin/budgets_spec.rb diff --git a/spec/features/admin/comments_spec.rb b/spec/system/admin/comments_spec.rb similarity index 100% rename from spec/features/admin/comments_spec.rb rename to spec/system/admin/comments_spec.rb diff --git a/spec/features/admin/dashboard/actions_spec.rb b/spec/system/admin/dashboard/actions_spec.rb similarity index 100% rename from spec/features/admin/dashboard/actions_spec.rb rename to spec/system/admin/dashboard/actions_spec.rb diff --git a/spec/features/admin/dashboard/administrator_tasks_spec.rb b/spec/system/admin/dashboard/administrator_tasks_spec.rb similarity index 100% rename from spec/features/admin/dashboard/administrator_tasks_spec.rb rename to spec/system/admin/dashboard/administrator_tasks_spec.rb diff --git a/spec/features/admin/debates_spec.rb b/spec/system/admin/debates_spec.rb similarity index 100% rename from spec/features/admin/debates_spec.rb rename to spec/system/admin/debates_spec.rb diff --git a/spec/features/admin/emails/emails_download_spec.rb b/spec/system/admin/emails/emails_download_spec.rb similarity index 100% rename from spec/features/admin/emails/emails_download_spec.rb rename to spec/system/admin/emails/emails_download_spec.rb diff --git a/spec/features/admin/emails/newsletters_spec.rb b/spec/system/admin/emails/newsletters_spec.rb similarity index 100% rename from spec/features/admin/emails/newsletters_spec.rb rename to spec/system/admin/emails/newsletters_spec.rb diff --git a/spec/features/admin/feature_flags_spec.rb b/spec/system/admin/feature_flags_spec.rb similarity index 100% rename from spec/features/admin/feature_flags_spec.rb rename to spec/system/admin/feature_flags_spec.rb diff --git a/spec/features/admin/geozones_spec.rb b/spec/system/admin/geozones_spec.rb similarity index 100% rename from spec/features/admin/geozones_spec.rb rename to spec/system/admin/geozones_spec.rb diff --git a/spec/features/admin/hidden_budget_investments_spec.rb b/spec/system/admin/hidden_budget_investments_spec.rb similarity index 100% rename from spec/features/admin/hidden_budget_investments_spec.rb rename to spec/system/admin/hidden_budget_investments_spec.rb diff --git a/spec/features/admin/hidden_comments_spec.rb b/spec/system/admin/hidden_comments_spec.rb similarity index 100% rename from spec/features/admin/hidden_comments_spec.rb rename to spec/system/admin/hidden_comments_spec.rb diff --git a/spec/features/admin/hidden_debates_spec.rb b/spec/system/admin/hidden_debates_spec.rb similarity index 100% rename from spec/features/admin/hidden_debates_spec.rb rename to spec/system/admin/hidden_debates_spec.rb diff --git a/spec/features/admin/hidden_proposals_spec.rb b/spec/system/admin/hidden_proposals_spec.rb similarity index 100% rename from spec/features/admin/hidden_proposals_spec.rb rename to spec/system/admin/hidden_proposals_spec.rb diff --git a/spec/features/admin/hidden_users_spec.rb b/spec/system/admin/hidden_users_spec.rb similarity index 100% rename from spec/features/admin/hidden_users_spec.rb rename to spec/system/admin/hidden_users_spec.rb diff --git a/spec/features/admin/homepage/homepage_spec.rb b/spec/system/admin/homepage/homepage_spec.rb similarity index 100% rename from spec/features/admin/homepage/homepage_spec.rb rename to spec/system/admin/homepage/homepage_spec.rb diff --git a/spec/features/admin/legislation/draft_versions_spec.rb b/spec/system/admin/legislation/draft_versions_spec.rb similarity index 100% rename from spec/features/admin/legislation/draft_versions_spec.rb rename to spec/system/admin/legislation/draft_versions_spec.rb diff --git a/spec/features/admin/legislation/processes_spec.rb b/spec/system/admin/legislation/processes_spec.rb similarity index 100% rename from spec/features/admin/legislation/processes_spec.rb rename to spec/system/admin/legislation/processes_spec.rb diff --git a/spec/features/admin/legislation/proposals_spec.rb b/spec/system/admin/legislation/proposals_spec.rb similarity index 100% rename from spec/features/admin/legislation/proposals_spec.rb rename to spec/system/admin/legislation/proposals_spec.rb diff --git a/spec/features/admin/legislation/questions_spec.rb b/spec/system/admin/legislation/questions_spec.rb similarity index 100% rename from spec/features/admin/legislation/questions_spec.rb rename to spec/system/admin/legislation/questions_spec.rb diff --git a/spec/features/admin/local_census_records/imports_spec.rb b/spec/system/admin/local_census_records/imports_spec.rb similarity index 100% rename from spec/features/admin/local_census_records/imports_spec.rb rename to spec/system/admin/local_census_records/imports_spec.rb diff --git a/spec/features/admin/local_census_records_spec.rb b/spec/system/admin/local_census_records_spec.rb similarity index 100% rename from spec/features/admin/local_census_records_spec.rb rename to spec/system/admin/local_census_records_spec.rb diff --git a/spec/features/admin/managers_spec.rb b/spec/system/admin/managers_spec.rb similarity index 100% rename from spec/features/admin/managers_spec.rb rename to spec/system/admin/managers_spec.rb diff --git a/spec/features/admin/milestone_statuses_spec.rb b/spec/system/admin/milestone_statuses_spec.rb similarity index 100% rename from spec/features/admin/milestone_statuses_spec.rb rename to spec/system/admin/milestone_statuses_spec.rb diff --git a/spec/features/admin/moderators_spec.rb b/spec/system/admin/moderators_spec.rb similarity index 100% rename from spec/features/admin/moderators_spec.rb rename to spec/system/admin/moderators_spec.rb diff --git a/spec/features/admin/officials_spec.rb b/spec/system/admin/officials_spec.rb similarity index 100% rename from spec/features/admin/officials_spec.rb rename to spec/system/admin/officials_spec.rb diff --git a/spec/features/admin/organizations_spec.rb b/spec/system/admin/organizations_spec.rb similarity index 100% rename from spec/features/admin/organizations_spec.rb rename to spec/system/admin/organizations_spec.rb diff --git a/spec/features/admin/poll/active_polls_spec.rb b/spec/system/admin/poll/active_polls_spec.rb similarity index 100% rename from spec/features/admin/poll/active_polls_spec.rb rename to spec/system/admin/poll/active_polls_spec.rb diff --git a/spec/features/admin/poll/booth_assigments_spec.rb b/spec/system/admin/poll/booth_assigments_spec.rb similarity index 100% rename from spec/features/admin/poll/booth_assigments_spec.rb rename to spec/system/admin/poll/booth_assigments_spec.rb diff --git a/spec/features/admin/poll/booths_spec.rb b/spec/system/admin/poll/booths_spec.rb similarity index 100% rename from spec/features/admin/poll/booths_spec.rb rename to spec/system/admin/poll/booths_spec.rb diff --git a/spec/features/admin/poll/officer_assignments_spec.rb b/spec/system/admin/poll/officer_assignments_spec.rb similarity index 100% rename from spec/features/admin/poll/officer_assignments_spec.rb rename to spec/system/admin/poll/officer_assignments_spec.rb diff --git a/spec/features/admin/poll/officers_spec.rb b/spec/system/admin/poll/officers_spec.rb similarity index 100% rename from spec/features/admin/poll/officers_spec.rb rename to spec/system/admin/poll/officers_spec.rb diff --git a/spec/features/admin/poll/polls_spec.rb b/spec/system/admin/poll/polls_spec.rb similarity index 100% rename from spec/features/admin/poll/polls_spec.rb rename to spec/system/admin/poll/polls_spec.rb diff --git a/spec/features/admin/poll/questions/answers/answers_spec.rb b/spec/system/admin/poll/questions/answers/answers_spec.rb similarity index 100% rename from spec/features/admin/poll/questions/answers/answers_spec.rb rename to spec/system/admin/poll/questions/answers/answers_spec.rb diff --git a/spec/features/admin/poll/questions/answers/documents/documents_spec.rb b/spec/system/admin/poll/questions/answers/documents/documents_spec.rb similarity index 100% rename from spec/features/admin/poll/questions/answers/documents/documents_spec.rb rename to spec/system/admin/poll/questions/answers/documents/documents_spec.rb diff --git a/spec/features/admin/poll/questions/answers/images/images_spec.rb b/spec/system/admin/poll/questions/answers/images/images_spec.rb similarity index 100% rename from spec/features/admin/poll/questions/answers/images/images_spec.rb rename to spec/system/admin/poll/questions/answers/images/images_spec.rb diff --git a/spec/features/admin/poll/questions/answers/videos/videos_spec.rb b/spec/system/admin/poll/questions/answers/videos/videos_spec.rb similarity index 100% rename from spec/features/admin/poll/questions/answers/videos/videos_spec.rb rename to spec/system/admin/poll/questions/answers/videos/videos_spec.rb diff --git a/spec/features/admin/poll/questions_spec.rb b/spec/system/admin/poll/questions_spec.rb similarity index 100% rename from spec/features/admin/poll/questions_spec.rb rename to spec/system/admin/poll/questions_spec.rb diff --git a/spec/features/admin/poll/shifts_spec.rb b/spec/system/admin/poll/shifts_spec.rb similarity index 100% rename from spec/features/admin/poll/shifts_spec.rb rename to spec/system/admin/poll/shifts_spec.rb diff --git a/spec/features/admin/proposal_notifications_spec.rb b/spec/system/admin/proposal_notifications_spec.rb similarity index 100% rename from spec/features/admin/proposal_notifications_spec.rb rename to spec/system/admin/proposal_notifications_spec.rb diff --git a/spec/features/admin/proposals_spec.rb b/spec/system/admin/proposals_spec.rb similarity index 100% rename from spec/features/admin/proposals_spec.rb rename to spec/system/admin/proposals_spec.rb diff --git a/spec/features/admin/settings_spec.rb b/spec/system/admin/settings_spec.rb similarity index 100% rename from spec/features/admin/settings_spec.rb rename to spec/system/admin/settings_spec.rb diff --git a/spec/features/admin/signature_sheets_spec.rb b/spec/system/admin/signature_sheets_spec.rb similarity index 100% rename from spec/features/admin/signature_sheets_spec.rb rename to spec/system/admin/signature_sheets_spec.rb diff --git a/spec/features/admin/site_customization/content_blocks_spec.rb b/spec/system/admin/site_customization/content_blocks_spec.rb similarity index 100% rename from spec/features/admin/site_customization/content_blocks_spec.rb rename to spec/system/admin/site_customization/content_blocks_spec.rb diff --git a/spec/features/admin/site_customization/documents_spec.rb b/spec/system/admin/site_customization/documents_spec.rb similarity index 100% rename from spec/features/admin/site_customization/documents_spec.rb rename to spec/system/admin/site_customization/documents_spec.rb diff --git a/spec/features/admin/site_customization/images_spec.rb b/spec/system/admin/site_customization/images_spec.rb similarity index 100% rename from spec/features/admin/site_customization/images_spec.rb rename to spec/system/admin/site_customization/images_spec.rb diff --git a/spec/features/admin/site_customization/information_texts_spec.rb b/spec/system/admin/site_customization/information_texts_spec.rb similarity index 100% rename from spec/features/admin/site_customization/information_texts_spec.rb rename to spec/system/admin/site_customization/information_texts_spec.rb diff --git a/spec/features/admin/site_customization/pages_spec.rb b/spec/system/admin/site_customization/pages_spec.rb similarity index 100% rename from spec/features/admin/site_customization/pages_spec.rb rename to spec/system/admin/site_customization/pages_spec.rb diff --git a/spec/features/admin/stats_spec.rb b/spec/system/admin/stats_spec.rb similarity index 100% rename from spec/features/admin/stats_spec.rb rename to spec/system/admin/stats_spec.rb diff --git a/spec/features/admin/system_emails_spec.rb b/spec/system/admin/system_emails_spec.rb similarity index 100% rename from spec/features/admin/system_emails_spec.rb rename to spec/system/admin/system_emails_spec.rb diff --git a/spec/features/admin/tags_spec.rb b/spec/system/admin/tags_spec.rb similarity index 100% rename from spec/features/admin/tags_spec.rb rename to spec/system/admin/tags_spec.rb diff --git a/spec/features/admin/translatable_spec.rb b/spec/system/admin/translatable_spec.rb similarity index 100% rename from spec/features/admin/translatable_spec.rb rename to spec/system/admin/translatable_spec.rb diff --git a/spec/features/admin/users_spec.rb b/spec/system/admin/users_spec.rb similarity index 100% rename from spec/features/admin/users_spec.rb rename to spec/system/admin/users_spec.rb diff --git a/spec/features/admin/valuator_groups_spec.rb b/spec/system/admin/valuator_groups_spec.rb similarity index 100% rename from spec/features/admin/valuator_groups_spec.rb rename to spec/system/admin/valuator_groups_spec.rb diff --git a/spec/features/admin/valuators_spec.rb b/spec/system/admin/valuators_spec.rb similarity index 100% rename from spec/features/admin/valuators_spec.rb rename to spec/system/admin/valuators_spec.rb diff --git a/spec/features/admin/verifications_spec.rb b/spec/system/admin/verifications_spec.rb similarity index 100% rename from spec/features/admin/verifications_spec.rb rename to spec/system/admin/verifications_spec.rb diff --git a/spec/features/admin/widgets/cards_spec.rb b/spec/system/admin/widgets/cards_spec.rb similarity index 100% rename from spec/features/admin/widgets/cards_spec.rb rename to spec/system/admin/widgets/cards_spec.rb diff --git a/spec/features/admin_spec.rb b/spec/system/admin_spec.rb similarity index 100% rename from spec/features/admin_spec.rb rename to spec/system/admin_spec.rb diff --git a/spec/features/banners_spec.rb b/spec/system/banners_spec.rb similarity index 100% rename from spec/features/banners_spec.rb rename to spec/system/banners_spec.rb diff --git a/spec/features/budget_polls/ballot_sheets_spec.rb b/spec/system/budget_polls/ballot_sheets_spec.rb similarity index 100% rename from spec/features/budget_polls/ballot_sheets_spec.rb rename to spec/system/budget_polls/ballot_sheets_spec.rb diff --git a/spec/features/budget_polls/budgets_spec.rb b/spec/system/budget_polls/budgets_spec.rb similarity index 100% rename from spec/features/budget_polls/budgets_spec.rb rename to spec/system/budget_polls/budgets_spec.rb diff --git a/spec/features/budget_polls/officing_spec.rb b/spec/system/budget_polls/officing_spec.rb similarity index 100% rename from spec/features/budget_polls/officing_spec.rb rename to spec/system/budget_polls/officing_spec.rb diff --git a/spec/features/budget_polls/polls_spec.rb b/spec/system/budget_polls/polls_spec.rb similarity index 100% rename from spec/features/budget_polls/polls_spec.rb rename to spec/system/budget_polls/polls_spec.rb diff --git a/spec/features/budget_polls/questions_spec.rb b/spec/system/budget_polls/questions_spec.rb similarity index 100% rename from spec/features/budget_polls/questions_spec.rb rename to spec/system/budget_polls/questions_spec.rb diff --git a/spec/features/budget_polls/voter_spec.rb b/spec/system/budget_polls/voter_spec.rb similarity index 100% rename from spec/features/budget_polls/voter_spec.rb rename to spec/system/budget_polls/voter_spec.rb diff --git a/spec/features/budgets/ballots_spec.rb b/spec/system/budgets/ballots_spec.rb similarity index 100% rename from spec/features/budgets/ballots_spec.rb rename to spec/system/budgets/ballots_spec.rb diff --git a/spec/features/budgets/budgets_spec.rb b/spec/system/budgets/budgets_spec.rb similarity index 100% rename from spec/features/budgets/budgets_spec.rb rename to spec/system/budgets/budgets_spec.rb diff --git a/spec/features/budgets/executions_spec.rb b/spec/system/budgets/executions_spec.rb similarity index 100% rename from spec/features/budgets/executions_spec.rb rename to spec/system/budgets/executions_spec.rb diff --git a/spec/features/budgets/groups_spec.rb b/spec/system/budgets/groups_spec.rb similarity index 100% rename from spec/features/budgets/groups_spec.rb rename to spec/system/budgets/groups_spec.rb diff --git a/spec/features/budgets/investments_spec.rb b/spec/system/budgets/investments_spec.rb similarity index 100% rename from spec/features/budgets/investments_spec.rb rename to spec/system/budgets/investments_spec.rb diff --git a/spec/features/budgets/results_spec.rb b/spec/system/budgets/results_spec.rb similarity index 100% rename from spec/features/budgets/results_spec.rb rename to spec/system/budgets/results_spec.rb diff --git a/spec/features/budgets/stats_spec.rb b/spec/system/budgets/stats_spec.rb similarity index 100% rename from spec/features/budgets/stats_spec.rb rename to spec/system/budgets/stats_spec.rb diff --git a/spec/features/budgets/votes_spec.rb b/spec/system/budgets/votes_spec.rb similarity index 100% rename from spec/features/budgets/votes_spec.rb rename to spec/system/budgets/votes_spec.rb diff --git a/spec/features/campaigns_spec.rb b/spec/system/campaigns_spec.rb similarity index 100% rename from spec/features/campaigns_spec.rb rename to spec/system/campaigns_spec.rb diff --git a/spec/features/ckeditor_spec.rb b/spec/system/ckeditor_spec.rb similarity index 100% rename from spec/features/ckeditor_spec.rb rename to spec/system/ckeditor_spec.rb diff --git a/spec/features/comments/budget_investments_spec.rb b/spec/system/comments/budget_investments_spec.rb similarity index 100% rename from spec/features/comments/budget_investments_spec.rb rename to spec/system/comments/budget_investments_spec.rb diff --git a/spec/features/comments/budget_investments_valuation_spec.rb b/spec/system/comments/budget_investments_valuation_spec.rb similarity index 100% rename from spec/features/comments/budget_investments_valuation_spec.rb rename to spec/system/comments/budget_investments_valuation_spec.rb diff --git a/spec/features/comments/debates_spec.rb b/spec/system/comments/debates_spec.rb similarity index 100% rename from spec/features/comments/debates_spec.rb rename to spec/system/comments/debates_spec.rb diff --git a/spec/features/comments/legislation_annotations_spec.rb b/spec/system/comments/legislation_annotations_spec.rb similarity index 100% rename from spec/features/comments/legislation_annotations_spec.rb rename to spec/system/comments/legislation_annotations_spec.rb diff --git a/spec/features/comments/legislation_questions_spec.rb b/spec/system/comments/legislation_questions_spec.rb similarity index 100% rename from spec/features/comments/legislation_questions_spec.rb rename to spec/system/comments/legislation_questions_spec.rb diff --git a/spec/features/comments/poll_questions_spec.rb b/spec/system/comments/poll_questions_spec.rb similarity index 100% rename from spec/features/comments/poll_questions_spec.rb rename to spec/system/comments/poll_questions_spec.rb diff --git a/spec/features/comments/polls_spec.rb b/spec/system/comments/polls_spec.rb similarity index 100% rename from spec/features/comments/polls_spec.rb rename to spec/system/comments/polls_spec.rb diff --git a/spec/features/comments/proposals_spec.rb b/spec/system/comments/proposals_spec.rb similarity index 100% rename from spec/features/comments/proposals_spec.rb rename to spec/system/comments/proposals_spec.rb diff --git a/spec/features/comments/topics_spec.rb b/spec/system/comments/topics_spec.rb similarity index 100% rename from spec/features/comments/topics_spec.rb rename to spec/system/comments/topics_spec.rb diff --git a/spec/features/communities_spec.rb b/spec/system/communities_spec.rb similarity index 100% rename from spec/features/communities_spec.rb rename to spec/system/communities_spec.rb diff --git a/spec/features/dashboard/dashboard_spec.rb b/spec/system/dashboard/dashboard_spec.rb similarity index 100% rename from spec/features/dashboard/dashboard_spec.rb rename to spec/system/dashboard/dashboard_spec.rb diff --git a/spec/features/dashboard/mailing_spec.rb b/spec/system/dashboard/mailing_spec.rb similarity index 100% rename from spec/features/dashboard/mailing_spec.rb rename to spec/system/dashboard/mailing_spec.rb diff --git a/spec/features/dashboard/polls_spec.rb b/spec/system/dashboard/polls_spec.rb similarity index 100% rename from spec/features/dashboard/polls_spec.rb rename to spec/system/dashboard/polls_spec.rb diff --git a/spec/features/dashboard/poster_spec.rb b/spec/system/dashboard/poster_spec.rb similarity index 100% rename from spec/features/dashboard/poster_spec.rb rename to spec/system/dashboard/poster_spec.rb diff --git a/spec/features/debates_spec.rb b/spec/system/debates_spec.rb similarity index 100% rename from spec/features/debates_spec.rb rename to spec/system/debates_spec.rb diff --git a/spec/features/direct_messages_spec.rb b/spec/system/direct_messages_spec.rb similarity index 100% rename from spec/features/direct_messages_spec.rb rename to spec/system/direct_messages_spec.rb diff --git a/spec/features/emails_spec.rb b/spec/system/emails_spec.rb similarity index 100% rename from spec/features/emails_spec.rb rename to spec/system/emails_spec.rb diff --git a/spec/features/help_page_spec.rb b/spec/system/help_page_spec.rb similarity index 100% rename from spec/features/help_page_spec.rb rename to spec/system/help_page_spec.rb diff --git a/spec/features/home_spec.rb b/spec/system/home_spec.rb similarity index 100% rename from spec/features/home_spec.rb rename to spec/system/home_spec.rb diff --git a/spec/features/legislation/draft_versions_spec.rb b/spec/system/legislation/draft_versions_spec.rb similarity index 100% rename from spec/features/legislation/draft_versions_spec.rb rename to spec/system/legislation/draft_versions_spec.rb diff --git a/spec/features/legislation/processes_spec.rb b/spec/system/legislation/processes_spec.rb similarity index 100% rename from spec/features/legislation/processes_spec.rb rename to spec/system/legislation/processes_spec.rb diff --git a/spec/features/legislation/proposals_spec.rb b/spec/system/legislation/proposals_spec.rb similarity index 100% rename from spec/features/legislation/proposals_spec.rb rename to spec/system/legislation/proposals_spec.rb diff --git a/spec/features/legislation/questions_spec.rb b/spec/system/legislation/questions_spec.rb similarity index 100% rename from spec/features/legislation/questions_spec.rb rename to spec/system/legislation/questions_spec.rb diff --git a/spec/features/localization_spec.rb b/spec/system/localization_spec.rb similarity index 100% rename from spec/features/localization_spec.rb rename to spec/system/localization_spec.rb diff --git a/spec/features/management/account_spec.rb b/spec/system/management/account_spec.rb similarity index 100% rename from spec/features/management/account_spec.rb rename to spec/system/management/account_spec.rb diff --git a/spec/features/management/budget_investments_spec.rb b/spec/system/management/budget_investments_spec.rb similarity index 100% rename from spec/features/management/budget_investments_spec.rb rename to spec/system/management/budget_investments_spec.rb diff --git a/spec/features/management/document_verifications_spec.rb b/spec/system/management/document_verifications_spec.rb similarity index 100% rename from spec/features/management/document_verifications_spec.rb rename to spec/system/management/document_verifications_spec.rb diff --git a/spec/features/management/email_verifications_spec.rb b/spec/system/management/email_verifications_spec.rb similarity index 100% rename from spec/features/management/email_verifications_spec.rb rename to spec/system/management/email_verifications_spec.rb diff --git a/spec/features/management/localization_spec.rb b/spec/system/management/localization_spec.rb similarity index 100% rename from spec/features/management/localization_spec.rb rename to spec/system/management/localization_spec.rb diff --git a/spec/features/management/managed_users_spec.rb b/spec/system/management/managed_users_spec.rb similarity index 100% rename from spec/features/management/managed_users_spec.rb rename to spec/system/management/managed_users_spec.rb diff --git a/spec/features/management/proposals_spec.rb b/spec/system/management/proposals_spec.rb similarity index 100% rename from spec/features/management/proposals_spec.rb rename to spec/system/management/proposals_spec.rb diff --git a/spec/features/management/users_spec.rb b/spec/system/management/users_spec.rb similarity index 100% rename from spec/features/management/users_spec.rb rename to spec/system/management/users_spec.rb diff --git a/spec/features/management_spec.rb b/spec/system/management_spec.rb similarity index 100% rename from spec/features/management_spec.rb rename to spec/system/management_spec.rb diff --git a/spec/features/moderation/budget_investments_spec.rb b/spec/system/moderation/budget_investments_spec.rb similarity index 100% rename from spec/features/moderation/budget_investments_spec.rb rename to spec/system/moderation/budget_investments_spec.rb diff --git a/spec/features/moderation/comments_spec.rb b/spec/system/moderation/comments_spec.rb similarity index 100% rename from spec/features/moderation/comments_spec.rb rename to spec/system/moderation/comments_spec.rb diff --git a/spec/features/moderation/debates_spec.rb b/spec/system/moderation/debates_spec.rb similarity index 100% rename from spec/features/moderation/debates_spec.rb rename to spec/system/moderation/debates_spec.rb diff --git a/spec/features/moderation/legislation_proposals_spec.rb b/spec/system/moderation/legislation_proposals_spec.rb similarity index 100% rename from spec/features/moderation/legislation_proposals_spec.rb rename to spec/system/moderation/legislation_proposals_spec.rb diff --git a/spec/features/moderation/proposal_notifications_spec.rb b/spec/system/moderation/proposal_notifications_spec.rb similarity index 100% rename from spec/features/moderation/proposal_notifications_spec.rb rename to spec/system/moderation/proposal_notifications_spec.rb diff --git a/spec/features/moderation/proposals_spec.rb b/spec/system/moderation/proposals_spec.rb similarity index 100% rename from spec/features/moderation/proposals_spec.rb rename to spec/system/moderation/proposals_spec.rb diff --git a/spec/features/moderation/users_spec.rb b/spec/system/moderation/users_spec.rb similarity index 100% rename from spec/features/moderation/users_spec.rb rename to spec/system/moderation/users_spec.rb diff --git a/spec/features/moderation_spec.rb b/spec/system/moderation_spec.rb similarity index 100% rename from spec/features/moderation_spec.rb rename to spec/system/moderation_spec.rb diff --git a/spec/features/notifications_spec.rb b/spec/system/notifications_spec.rb similarity index 100% rename from spec/features/notifications_spec.rb rename to spec/system/notifications_spec.rb diff --git a/spec/features/official_positions_spec.rb b/spec/system/official_positions_spec.rb similarity index 100% rename from spec/features/official_positions_spec.rb rename to spec/system/official_positions_spec.rb diff --git a/spec/features/officing/booth_spec.rb b/spec/system/officing/booth_spec.rb similarity index 100% rename from spec/features/officing/booth_spec.rb rename to spec/system/officing/booth_spec.rb diff --git a/spec/features/officing/residence_spec.rb b/spec/system/officing/residence_spec.rb similarity index 100% rename from spec/features/officing/residence_spec.rb rename to spec/system/officing/residence_spec.rb diff --git a/spec/features/officing/results_spec.rb b/spec/system/officing/results_spec.rb similarity index 100% rename from spec/features/officing/results_spec.rb rename to spec/system/officing/results_spec.rb diff --git a/spec/features/officing/voters_spec.rb b/spec/system/officing/voters_spec.rb similarity index 100% rename from spec/features/officing/voters_spec.rb rename to spec/system/officing/voters_spec.rb diff --git a/spec/features/officing_spec.rb b/spec/system/officing_spec.rb similarity index 100% rename from spec/features/officing_spec.rb rename to spec/system/officing_spec.rb diff --git a/spec/features/organizations_spec.rb b/spec/system/organizations_spec.rb similarity index 100% rename from spec/features/organizations_spec.rb rename to spec/system/organizations_spec.rb diff --git a/spec/features/polls/polls_spec.rb b/spec/system/polls/polls_spec.rb similarity index 100% rename from spec/features/polls/polls_spec.rb rename to spec/system/polls/polls_spec.rb diff --git a/spec/features/polls/questions_spec.rb b/spec/system/polls/questions_spec.rb similarity index 100% rename from spec/features/polls/questions_spec.rb rename to spec/system/polls/questions_spec.rb diff --git a/spec/features/polls/results_spec.rb b/spec/system/polls/results_spec.rb similarity index 100% rename from spec/features/polls/results_spec.rb rename to spec/system/polls/results_spec.rb diff --git a/spec/features/polls/voter_spec.rb b/spec/system/polls/voter_spec.rb similarity index 100% rename from spec/features/polls/voter_spec.rb rename to spec/system/polls/voter_spec.rb diff --git a/spec/features/proposal_ballots_spec.rb b/spec/system/proposal_ballots_spec.rb similarity index 100% rename from spec/features/proposal_ballots_spec.rb rename to spec/system/proposal_ballots_spec.rb diff --git a/spec/features/proposal_notifications_spec.rb b/spec/system/proposal_notifications_spec.rb similarity index 100% rename from spec/features/proposal_notifications_spec.rb rename to spec/system/proposal_notifications_spec.rb diff --git a/spec/features/proposals_spec.rb b/spec/system/proposals_spec.rb similarity index 100% rename from spec/features/proposals_spec.rb rename to spec/system/proposals_spec.rb diff --git a/spec/features/registration_form_spec.rb b/spec/system/registration_form_spec.rb similarity index 100% rename from spec/features/registration_form_spec.rb rename to spec/system/registration_form_spec.rb diff --git a/spec/features/remote_translations_spec.rb b/spec/system/remote_translations_spec.rb similarity index 100% rename from spec/features/remote_translations_spec.rb rename to spec/system/remote_translations_spec.rb diff --git a/spec/features/sessions_spec.rb b/spec/system/sessions_spec.rb similarity index 100% rename from spec/features/sessions_spec.rb rename to spec/system/sessions_spec.rb diff --git a/spec/features/site_customization/content_blocks_spec.rb b/spec/system/site_customization/content_blocks_spec.rb similarity index 100% rename from spec/features/site_customization/content_blocks_spec.rb rename to spec/system/site_customization/content_blocks_spec.rb diff --git a/spec/features/site_customization/custom_pages_spec.rb b/spec/system/site_customization/custom_pages_spec.rb similarity index 100% rename from spec/features/site_customization/custom_pages_spec.rb rename to spec/system/site_customization/custom_pages_spec.rb diff --git a/spec/features/site_customization/information_texts_spec.rb b/spec/system/site_customization/information_texts_spec.rb similarity index 100% rename from spec/features/site_customization/information_texts_spec.rb rename to spec/system/site_customization/information_texts_spec.rb diff --git a/spec/features/social_media_meta_tags_spec.rb b/spec/system/social_media_meta_tags_spec.rb similarity index 100% rename from spec/features/social_media_meta_tags_spec.rb rename to spec/system/social_media_meta_tags_spec.rb diff --git a/spec/features/stats_spec.rb b/spec/system/stats_spec.rb similarity index 100% rename from spec/features/stats_spec.rb rename to spec/system/stats_spec.rb diff --git a/spec/features/tags/budget_investments_spec.rb b/spec/system/tags/budget_investments_spec.rb similarity index 100% rename from spec/features/tags/budget_investments_spec.rb rename to spec/system/tags/budget_investments_spec.rb diff --git a/spec/features/tags/debates_spec.rb b/spec/system/tags/debates_spec.rb similarity index 100% rename from spec/features/tags/debates_spec.rb rename to spec/system/tags/debates_spec.rb diff --git a/spec/features/tags/proposals_spec.rb b/spec/system/tags/proposals_spec.rb similarity index 100% rename from spec/features/tags/proposals_spec.rb rename to spec/system/tags/proposals_spec.rb diff --git a/spec/features/tags_spec.rb b/spec/system/tags_spec.rb similarity index 100% rename from spec/features/tags_spec.rb rename to spec/system/tags_spec.rb diff --git a/spec/features/topics_spec.rb b/spec/system/topics_spec.rb similarity index 100% rename from spec/features/topics_spec.rb rename to spec/system/topics_spec.rb diff --git a/spec/features/tracks_spec.rb b/spec/system/tracks_spec.rb similarity index 100% rename from spec/features/tracks_spec.rb rename to spec/system/tracks_spec.rb diff --git a/spec/features/translatable_spec.rb b/spec/system/translatable_spec.rb similarity index 100% rename from spec/features/translatable_spec.rb rename to spec/system/translatable_spec.rb diff --git a/spec/features/user_invites_spec.rb b/spec/system/user_invites_spec.rb similarity index 100% rename from spec/features/user_invites_spec.rb rename to spec/system/user_invites_spec.rb diff --git a/spec/features/users_auth_spec.rb b/spec/system/users_auth_spec.rb similarity index 100% rename from spec/features/users_auth_spec.rb rename to spec/system/users_auth_spec.rb diff --git a/spec/features/users_spec.rb b/spec/system/users_spec.rb similarity index 100% rename from spec/features/users_spec.rb rename to spec/system/users_spec.rb diff --git a/spec/features/valuation/budget_investments_spec.rb b/spec/system/valuation/budget_investments_spec.rb similarity index 100% rename from spec/features/valuation/budget_investments_spec.rb rename to spec/system/valuation/budget_investments_spec.rb diff --git a/spec/features/valuation/budgets_spec.rb b/spec/system/valuation/budgets_spec.rb similarity index 100% rename from spec/features/valuation/budgets_spec.rb rename to spec/system/valuation/budgets_spec.rb diff --git a/spec/features/valuation_spec.rb b/spec/system/valuation_spec.rb similarity index 100% rename from spec/features/valuation_spec.rb rename to spec/system/valuation_spec.rb diff --git a/spec/features/verification/email_spec.rb b/spec/system/verification/email_spec.rb similarity index 100% rename from spec/features/verification/email_spec.rb rename to spec/system/verification/email_spec.rb diff --git a/spec/features/verification/letter_spec.rb b/spec/system/verification/letter_spec.rb similarity index 100% rename from spec/features/verification/letter_spec.rb rename to spec/system/verification/letter_spec.rb diff --git a/spec/features/verification/level_three_verification_spec.rb b/spec/system/verification/level_three_verification_spec.rb similarity index 100% rename from spec/features/verification/level_three_verification_spec.rb rename to spec/system/verification/level_three_verification_spec.rb diff --git a/spec/features/verification/level_two_verification_spec.rb b/spec/system/verification/level_two_verification_spec.rb similarity index 100% rename from spec/features/verification/level_two_verification_spec.rb rename to spec/system/verification/level_two_verification_spec.rb diff --git a/spec/features/verification/residence_spec.rb b/spec/system/verification/residence_spec.rb similarity index 100% rename from spec/features/verification/residence_spec.rb rename to spec/system/verification/residence_spec.rb diff --git a/spec/features/verification/sms_spec.rb b/spec/system/verification/sms_spec.rb similarity index 100% rename from spec/features/verification/sms_spec.rb rename to spec/system/verification/sms_spec.rb diff --git a/spec/features/verification/verification_path_spec.rb b/spec/system/verification/verification_path_spec.rb similarity index 100% rename from spec/features/verification/verification_path_spec.rb rename to spec/system/verification/verification_path_spec.rb diff --git a/spec/features/verification/verified_user_spec.rb b/spec/system/verification/verified_user_spec.rb similarity index 100% rename from spec/features/verification/verified_user_spec.rb rename to spec/system/verification/verified_user_spec.rb diff --git a/spec/features/votes_spec.rb b/spec/system/votes_spec.rb similarity index 100% rename from spec/features/votes_spec.rb rename to spec/system/votes_spec.rb diff --git a/spec/features/welcome_spec.rb b/spec/system/welcome_spec.rb similarity index 100% rename from spec/features/welcome_spec.rb rename to spec/system/welcome_spec.rb diff --git a/spec/features/xss_spec.rb b/spec/system/xss_spec.rb similarity index 100% rename from spec/features/xss_spec.rb rename to spec/system/xss_spec.rb