message_train 0.7.6 → 1.0.0

data/spec/models/message_train/receipt_spec.rb

@@ -8,7 +8,7 @@ module MessageTrain
       # Relationships
       it { should belong_to :message }
       it { should belong_to :recipient }
-      it { should belong_to :received_through }
+      it { should belong_to(:received_through).optional }
       # Validations
       it { should validate_presence_of :message }
       it { should validate_presence_of :recipient }

data/spec/models/message_train/unsubscribe_spec.rb

@@ -7,7 +7,7 @@ module MessageTrain
     describe 'Model' do
       # Relationships
       it { should belong_to :recipient }
-      it { should belong_to :from }
+      it { should belong_to(:from).optional }
       # Validations
       it { should validate_presence_of :recipient }
     end

data/spec/rails_helper.rb

@@ -1,5 +1,4 @@
-require 'coveralls'
-Coveralls.wear!
+require 'simplecov'
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV['RAILS_ENV'] ||= 'test'
@@ -12,11 +11,9 @@ require 'spec_helper'
 require 'rspec/rails'
 # Add additional requires below this line. Rails is not loaded until this point!
 require 'shoulda/matchers'
-require 'factory_girl_rails'
-require 'paperclip/matchers'
 require 'capybara/rspec'
-require 'capybara/poltergeist'
-require 'database_cleaner'
+require 'capybara/cuprite'
+require 'database_cleaner/active_record'
 require 'rake'
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
@@ -42,7 +39,10 @@ Dir[MessageTrain::Engine.root.join('spec/support/**/*.rb')]
 ActiveRecord::Migrator.migrations_paths = 'spec/dummy/db/migrate'
 ActiveRecord::Migration.maintain_test_schema!
 
-Capybara.javascript_driver = :poltergeist
+Capybara.register_driver(:cuprite) do |app|
+  Capybara::Cuprite::Driver.new(app, window_size: [1200, 800], process_timeout: 15)
+end
+Capybara.javascript_driver = :cuprite
 
 Shoulda::Matchers.configure do |config|
   config.integrate do |with|
@@ -57,6 +57,12 @@ RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
     DatabaseCleaner.clean_with(:truncation)
+    # Seedbank resolves seed files relative to Rake's process cwd
+    # (Rake.application.original_dir), not Rails.root, and memoizes that on
+    # first access. Since specs run from the gem root, not spec/dummy, this
+    # must be set before Dummy::Application.load_tasks triggers Seedbank's
+    # own task generation, or it silently finds no seed files at all.
+    Seedbank.application_root = MessageTrain::Engine.root.join('spec/dummy')
     Dummy::Application.load_tasks
     Rake::Task['db:seed'].invoke # loading seeds
   end
@@ -82,9 +88,6 @@ RSpec.configure do |config|
   # https://relishapp.com/rspec/rspec-rails/docs
   config.infer_spec_type_from_file_location!
 
-  config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
-  config.mock_with(:rspec) { |c| c.syntax = [:should, :expect] }
-
   config.before(:each) { @routes = MessageTrain::Engine.routes }
   config.include MessageTrain::Engine.routes.url_helpers
 
@@ -94,9 +97,7 @@ RSpec.configure do |config|
   config.include Devise::Test::ControllerHelpers, type: :routing
   config.include RSpecHtmlMatchers
 
-  # config.include(Shoulda::Matchers::ActiveRecord, type: :model)
-  config.include Paperclip::Shoulda::Matchers
   config.after(:suite) do
-    FileUtils.rm_rf(Dir["#{Rails.root}/public/system/test/*/*"])
+    FileUtils.rm_rf(Dir["#{Rails.root}/tmp/storage/*"])
   end
 end

data/spec/support/controller_behaviors.rb

@@ -1,7 +1,7 @@
 shared_examples_for 'a successful page' do |options = {}|
   context 'responds successfully' do
     subject { response }
-    it { should be_success }
+    it { is_expected.to be_successful }
   end
   if options[:which_renders].present?
     it_behaves_like 'a page rendering a template', options[:which_renders]
@@ -10,25 +10,25 @@ end
 shared_examples_for 'a page rendering a template' do |template|
   context "renders the #{template} template" do
     subject { response }
-    it { should render_template(template) }
+    it { is_expected.to render_template(template) }
   end
 end
 shared_examples_for 'an error response' do |http_status|
   context "issues error response code #{http_status}" do
     subject { response }
-    it { should have_http_status(http_status) }
+    it { is_expected.to have_http_status(http_status) }
   end
 end
 shared_examples_for 'a redirect to' do |path|
   context "redirects to #{path}" do
     subject { response }
-    it { should redirect_to path_to_url(path) }
+    it { is_expected.to redirect_to path_to_url(path) }
   end
 end
 shared_examples_for 'a redirect matching' do |path_expression|
   context "redirects matching #{path_expression}" do
     subject { response.location }
-    it { should match path_expression }
+    it { is_expected.to match path_expression }
   end
 end
 shared_examples_for 'a redirect to sign in' do
@@ -39,7 +39,7 @@ shared_examples_for 'a redirect with a message' do |path, options|
   options.each do |key, value|
     context "sets #{key} message" do
       subject { flash[key] }
-      it { should eq value }
+      it { is_expected.to eq value }
     end
   end
 end
@@ -47,7 +47,7 @@ shared_examples_for 'an error response with message' do |message|
   it_behaves_like 'an error response', :forbidden
   context 'sets failure message' do
     subject { flash[:error] }
-    it { should eq message }
+    it { is_expected.to eq message }
   end
 end
 shared_examples_for 'a 404 Not Found error' do
@@ -59,7 +59,7 @@ shared_examples_for 'a page with a message' do |options|
   options.each do |key, value|
     context "sets #{key} message" do
       subject { flash[key] }
-      it { should eq value }
+      it { is_expected.to eq value }
     end
   end
 end
@@ -68,7 +68,7 @@ shared_examples_for 'a page with a message matching' do |options|
   options.each do |key, value|
     context "sets #{key} message" do
       subject { flash[key] }
-      it { should match value }
+      it { is_expected.to match value }
     end
   end
 end
@@ -94,26 +94,26 @@ shared_examples_for 'a redirect with error' do |path, message|
   it_behaves_like 'a redirect to', path
   context 'sets error' do
     subject { flash[:error] }
-    it { should eq message }
+    it { is_expected.to eq message }
   end
 end
 shared_examples_for 'a redirect with notice' do |path, message|
   it_behaves_like 'a redirect to', path
   context 'sets notice' do
     subject { flash[:notice] }
-    it { should eq message }
+    it { is_expected.to eq message }
   end
 end
 shared_examples_for 'a redirect with alert' do |path, message|
   it_behaves_like 'a redirect to', path
   context 'sets alert' do
     subject { flash[:alert] }
-    it { should eq message }
+    it { is_expected.to eq message }
   end
 end
 shared_examples_for 'a response without error' do
   context 'sets no errors' do
     subject { flash[:error] }
-    it { should be nil }
+    it { is_expected.to be_nil }
   end
 end

data/spec/support/factory_bot.rb

@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.include FactoryBot::Syntax::Methods
+end

data/spec/support/feature_behaviors.rb

@@ -10,8 +10,8 @@ shared_examples_for 'an authenticated section' do |path|
     )
     context 'displays a login form' do
       subject { page }
-      it { should have_selector 'form.new_user input#user_email' }
-      it { should have_selector 'form.new_user input#user_password' }
+      it { is_expected.to have_selector 'form.new_user input#user_email' }
+      it { is_expected.to have_selector 'form.new_user input#user_password' }
     end
   end
 end
@@ -21,14 +21,14 @@ shared_examples_for 'a bootstrap page' do |options = {}|
   context 'displays a page with bootstrap elements' do
     subject { page }
     if options[:title].present?
-      it { should have_title html_escape(options[:title]) }
-      it { should have_xpath '//h1', text: options[:title] }
+      it { is_expected.to have_title html_escape(options[:title]) }
+      it { is_expected.to have_xpath '//h2', text: options[:title] }
     end
     it do
-      should(
+      expect(page).to(
         have_selector(
-          '.navbar .navbar-header .navbar-brand',
-          text: BootstrapLeather.configuration.application_title
+          '.top-navigation .site-brand',
+          text: MessageTrain.configuration.site_name
         )
       )
     end
@@ -40,21 +40,21 @@ shared_examples_for(
 ) do |options|
   if options[:text]
     it do
-      should have_selector 'li.dropdown a.dropdown-toggle', text: options[:text]
+      expect(page).to have_selector 'details.message-train-dropdown-nav-item summary', text: options[:text]
     end
   else
-    it { should have_selector 'li.dropdown a.dropdown-toggle' }
+    it { is_expected.to have_selector 'details.message-train-dropdown-nav-item summary' }
   end
 end
 
 shared_examples_for 'a bootstrap page with an alert' do |type, text|
   subject { page }
-  it { should have_selector ".alert.alert-#{type}", text: text }
+  it { is_expected.to have_selector "#alert_area .alert.#{type}", text: text }
 end
 
 shared_examples_for 'a bootstrap page without an alert' do |type|
   subject { page }
-  it { should_not have_selector ".alert.alert-#{type}" }
+  it { is_expected.not_to have_selector "#alert_area .alert.#{type}" }
 end
 
 shared_examples_for(
@@ -69,7 +69,7 @@ shared_examples_for(
   context "displays a list of ##{collection_css_id} in .#{member_css_class}" do
     subject { page }
     it do
-      should(
+      expect(page).to(
         have_css(
           "##{collection_css_id} .#{member_css_class}",
           minimum: options[:minimum]
@@ -86,7 +86,7 @@ shared_examples_for(
   it_behaves_like 'a bootstrap page', title: title
   context "displays an item at ##{options[:css_id]}" do
     subject { page }
-    it { should have_css("##{options[:css_id]}") }
+    it { is_expected.to have_css("##{options[:css_id]}") }
   end
 end
 
@@ -100,7 +100,7 @@ shared_examples_for 'a bootstrap form with errors' do |error_fields|
     )
     context 'shows which field has errors' do
       subject { page }
-      it { should have_css('.form-group.has-error', text: field.to_s.humanize) }
+      it { is_expected.to have_css('.field_with_errors', text: field.to_s.humanize) }
     end
   end
 end

data/spec/support/loaded_site/attachments.rb

@@ -1,8 +1,12 @@
 shared_context 'attachments' do
   let(:image_attachment) do
-    MessageTrain::Attachment.find_by_attachment_file_name('image-sample.jpg')
+    MessageTrain::Attachment
+      .joins(:attachment_blob)
+      .find_by(active_storage_blobs: { filename: 'image-sample.jpg' })
   end
   let(:pdf_attachment) do
-    MessageTrain::Attachment.find_by_attachment_file_name('pdf-sample.pdf')
+    MessageTrain::Attachment
+      .joins(:attachment_blob)
+      .find_by(active_storage_blobs: { filename: 'pdf-sample.pdf' })
   end
 end

data/spec/support/utilities.rb

@@ -9,33 +9,62 @@ def show_page
 end
 
 def submit_via_button(button_name)
-  button_id = find("input[type=submit][value='#{button_name}']")[:id]
-  page.execute_script("$('##{button_id}').click();")
-end
-
-# Used to fill ckeditor fields
-# @param [String] locator label text for the textarea or textarea id
-def fill_in_ckeditor(locator, options)
-  locator = find_field_by_label(locator)
-  # Fill the editor content
-  page.execute_script <<-SCRIPT
-      var ckeditor = CKEDITOR.instances.#{locator}
-      ckeditor.setData('#{ActionController::Base.helpers.j options[:with]}')
-      ckeditor.focus()
-      ckeditor.updateElement()
-  SCRIPT
+  click_button button_name
 end
 
 def fill_in_autocomplete(field, options = {})
   field = find_field_by_label(field)
   fill_in field, with: options[:with]
 
-  page.execute_script "$('##{field}').trigger('focus')"
-  page.execute_script "$('##{field}').trigger('keydown')"
+  # The Stimulus controller debounces the search and populates a <datalist>
+  # with the matching participant slugs; resolve to the first suggestion
+  # rather than submitting the raw partial query as the recipient. Some
+  # callers intentionally use a query with no real match (e.g. to leave
+  # recipients unresolved for a draft), so don't wait/fail if none appear.
+  list_id = find_field(field)[:list]
+  return unless page.has_css?("##{list_id} option", visible: :all, wait: 1)
+
+  suggestion = find("##{list_id} option", visible: :all)
+  fill_in field, with: suggestion[:value]
+end
+
+# Cuprite drives the app on a real server thread with its own DB
+# connection, so any marking it does through the browser commits outside
+# the spec's transaction and would otherwise leak into later examples
+# that reuse the same fixture conversation. Undo it the same way: on a
+# separate thread, so this write also commits immediately instead of
+# being rolled back with the rest of this example's (this thread's)
+# transaction. SQLite only allows one writer at a time, and the RSpec
+# thread's still-open transaction can be holding that lock at any given
+# moment, so retry a few times rather than racing it.
+def on_separate_connection(retries: 15)
+  Thread.new do
+    ActiveRecord::Base.connection_pool.with_connection do
+      begin
+        yield
+      rescue ActiveRecord::StatementInvalid => e
+        raise unless e.cause.is_a?(SQLite3::BusyException) && retries.positive?
+
+        sleep 0.3
+        retries -= 1
+        retry
+      end
+    end
+  end.join
+end
 
-  return unless page.has_selector?('.tt-menu .tt-suggestion')
-  selector = ".tt-menu .tt-suggestion:contains('#{options[:with]}')"
-  page.execute_script '$("' + selector + '").trigger("mouseenter").click()'
+def undo_leaked_mark(mark_to_set, conversation: unread_conversation)
+  on_separate_connection do
+    box = first_user.box(:in)
+    # Ignore/unignore isn't a Receipt "marked_*" column like the other
+    # marks - it's tracked on its own model, routed through here rather
+    # than Box#mark (matching how BoxesController#destroy dispatches it).
+    if %i[ignore unignore].include?(mark_to_set)
+      MessageTrain::Ignore.send(mark_to_set, conversation, box)
+    else
+      box.mark(mark_to_set, conversations: conversation)
+    end
+  end
 end
 
 def find_field_by_label(locator)