Merge pull request #34801 from bogdanvlviv/follow-up-34786

Follow up 34786

6 files changed, 5 insertions, 52 deletions

diff --git a/actionmailbox/.gitignore b/actionmailbox/.gitignore
index ead1a2d308..739e00a2cb 100644
--- a/actionmailbox/.gitignore
+++ b/actionmailbox/.gitignore
@@ -1,5 +1,5 @@
-.byebug_history
-*.sqlite3-journal
-.ruby-version
-.ruby-gemset
+/test/dummy/db/*.sqlite3
+/test/dummy/db/*.sqlite3-journal
+/test/dummy/log/*.log
+/test/dummy/tmp/
 /tmp/
diff --git a/actionmailbox/app/models/action_mailbox/inbound_email/message_id.rb b/actionmailbox/app/models/action_mailbox/inbound_email/message_id.rb
index 244a2e439b..2ad4525929 100644
--- a/actionmailbox/app/models/action_mailbox/inbound_email/message_id.rb
+++ b/actionmailbox/app/models/action_mailbox/inbound_email/message_id.rb
@@ -18,7 +18,7 @@ module ActionMailbox::InboundEmail::MessageId
     # attachment called `raw_email`. Before the upload, extract the Message-ID from the `source` and set
     # it as an attribute on the new `InboundEmail`.
     def create_and_extract_message_id!(source, **options)
-      create! message_id: extract_message_id(source), **options do |inbound_email|
+      create! options.merge(message_id: extract_message_id(source)) do |inbound_email|
         inbound_email.raw_email.attach io: StringIO.new(source), filename: "message.eml", content_type: "message/rfc822"
       end
     end
diff --git a/actionmailbox/test/dummy/.gitignore b/actionmailbox/test/dummy/.gitignore
deleted file mode 100644
index dfe3397eab..0000000000
--- a/actionmailbox/test/dummy/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.log
-*.sqlite3
-tmp/*
diff --git a/actionmailbox/test/dummy/log/development.log b/actionmailbox/test/dummy/log/development.log
deleted file mode 100644
index 892d873374..0000000000
--- a/actionmailbox/test/dummy/log/development.log
+++ /dev/null
@@ -1,44 +0,0 @@
-   (0.1ms)  SELECT sqlite_version(*)
-  ↳ ./bin/rails:4
-   (0.9ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL PRIMARY KEY)
-  ↳ ./bin/rails:4
-   (0.6ms)  CREATE TABLE "ar_internal_metadata" ("key" varchar NOT NULL PRIMARY KEY, "value" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL)
-  ↳ ./bin/rails:4
-   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-  ↳ ./bin/rails:4
-Migrating to CreateActionMailroomTables (20180208205311)
-   (0.0ms)  begin transaction
-  ↳ ./bin/rails:4
-   (0.3ms)  CREATE TABLE "action_mailroom_inbound_emails" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "status" integer DEFAULT 0 NOT NULL, "created_at" datetime(6), "updated_at" datetime(6))
-  ↳ db/migrate/20180208205311_create_action_mailroom_tables.rb:3
-  ActiveRecord::SchemaMigration Create (4.0ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20180208205311"]]
-  ↳ ./bin/rails:4
-   (0.5ms)  commit transaction
-  ↳ ./bin/rails:4
-Migrating to CreateActiveStorageTables (20180212164506)
-   (0.0ms)  begin transaction
-  ↳ ./bin/rails:4
-   (0.2ms)  CREATE TABLE "active_storage_blobs" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "key" varchar NOT NULL, "filename" varchar NOT NULL, "content_type" varchar, "metadata" text, "byte_size" bigint NOT NULL, "checksum" varchar NOT NULL, "created_at" datetime NOT NULL)
-  ↳ db/migrate/20180212164506_create_active_storage_tables.active_storage.rb:4
-   (0.1ms)  CREATE UNIQUE INDEX "index_active_storage_blobs_on_key" ON "active_storage_blobs" ("key")
-  ↳ db/migrate/20180212164506_create_active_storage_tables.active_storage.rb:4
-   (0.1ms)  CREATE TABLE "active_storage_attachments" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar NOT NULL, "record_type" varchar NOT NULL, "record_id" integer NOT NULL, "blob_id" integer NOT NULL, "created_at" datetime NOT NULL)
-  ↳ db/migrate/20180212164506_create_active_storage_tables.active_storage.rb:16
-   (0.1ms)  CREATE  INDEX "index_active_storage_attachments_on_blob_id" ON "active_storage_attachments" ("blob_id")
-  ↳ db/migrate/20180212164506_create_active_storage_tables.active_storage.rb:16
-   (0.1ms)  CREATE UNIQUE INDEX "index_active_storage_attachments_uniqueness" ON "active_storage_attachments" ("record_type", "record_id", "name", "blob_id")
-  ↳ db/migrate/20180212164506_create_active_storage_tables.active_storage.rb:16
-  ActiveRecord::SchemaMigration Create (0.1ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20180212164506"]]
-  ↳ ./bin/rails:4
-   (0.4ms)  commit transaction
-  ↳ ./bin/rails:4
-  ActiveRecord::InternalMetadata Load (0.1ms)  SELECT  "ar_internal_metadata".* FROM "ar_internal_metadata" WHERE "ar_internal_metadata"."key" = ? LIMIT ?  [["key", "environment"], ["LIMIT", 1]]
-  ↳ ./bin/rails:4
-   (0.0ms)  begin transaction
-  ↳ ./bin/rails:4
-  ActiveRecord::InternalMetadata Create (0.2ms)  INSERT INTO "ar_internal_metadata" ("key", "value", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["key", "environment"], ["value", "development"], ["created_at", "2018-09-18 00:47:15.287379"], ["updated_at", "2018-09-18 00:47:15.287379"]]
-  ↳ ./bin/rails:4
-   (0.4ms)  commit transaction
-  ↳ ./bin/rails:4
-   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" ORDER BY "schema_migrations"."version" ASC
-  ↳ ./bin/rails:4
diff --git a/actionmailbox/test/dummy/tmp/.keep b/actionmailbox/test/dummy/tmp/.keep
deleted file mode 100644
index e69de29bb2..0000000000
--- a/actionmailbox/test/dummy/tmp/.keep
+++ /dev/null
diff --git a/actionmailbox/test/dummy/tmp/storage/.keep b/actionmailbox/test/dummy/tmp/storage/.keep
deleted file mode 100644
index e69de29bb2..0000000000
--- a/actionmailbox/test/dummy/tmp/storage/.keep
+++ /dev/null