From 1045a8c3284ca008f1a6ea7135c001a616e510c7 Mon Sep 17 00:00:00 2001 From: Bilal Date: Tue, 4 Aug 2020 08:16:16 +0200 Subject: [PATCH 1/2] change bigmedia.ai to mesuite.ai --- app/helpers/mail_helper.rb | 2 +- app/mailers/admin_mailer.rb | 2 +- app/mailers/application_mailer.rb | 2 +- app/models/app_host.rb | 2 +- app/views/layouts/admin/application.html.erb | 2 +- app/views/layouts/application.html.erb | 2 +- .../user_mailer/project_invitation.html.erb | 2 +- .../user_mailer/project_invitation.text.erb | 2 +- db/structure.sql | 17 +++-------------- spec/features/user_managing_videos_spec.rb | 2 +- spec/helpers/mail_helper_spec.rb | 2 +- spec/mailers/admin_mailer_spec.rb | 16 ++++++++-------- spec/mailers/user_mailer_spec.rb | 6 +++--- spec/models/app_host_spec.rb | 2 +- 14 files changed, 25 insertions(+), 36 deletions(-) diff --git a/app/helpers/mail_helper.rb b/app/helpers/mail_helper.rb index 6c431b2..0b05aaf 100644 --- a/app/helpers/mail_helper.rb +++ b/app/helpers/mail_helper.rb @@ -6,6 +6,6 @@ module MailHelper "1. Tell us the name of the video: \n\n" \ "2. Attach each EDL to this email. Please make sure to indicate whether the EDL is a Video Only, Graphics Only, or Audio Only EDL." - mail_to "info@bigmedia.ai", content, subject: subject, body: body + mail_to "info@mesuite.ai", content, subject: subject, body: body end end diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index 7df03b1..5552e5f 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -1,5 +1,5 @@ class AdminMailer < ApplicationMailer - default to: %w(bray@bigmedia.ai lee@bigmedia.ai) + default to: %w(bray@mesuite.ai lee@mesuite.ai) def new_video(video) @video = video diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 625168f..defd59f 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,4 +1,4 @@ class ApplicationMailer < ActionMailer::Base - default from: ENV.fetch("MAILER_FROM_ADDRESS") { "support@bigmedia.ai" } + default from: ENV.fetch("MAILER_FROM_ADDRESS") { "support@mesuite.ai" } layout "mailer" end diff --git a/app/models/app_host.rb b/app/models/app_host.rb index 3ea8747..6cb1b1c 100644 --- a/app/models/app_host.rb +++ b/app/models/app_host.rb @@ -40,7 +40,7 @@ class AppHost use_ssl: false, }, production: { - host: "bigmedia.ai", + host: "mesuite.ai", use_ssl: true, } } diff --git a/app/views/layouts/admin/application.html.erb b/app/views/layouts/admin/application.html.erb index a12ee6a..1ab88e9 100644 --- a/app/views/layouts/admin/application.html.erb +++ b/app/views/layouts/admin/application.html.erb @@ -1,7 +1,7 @@ - BiGMedia.ai App + MESuite.ai App <%= csrf_meta_tags %> <%= csp_meta_tag %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 5bee701..b2e5751 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - BiGMedia.ai App + MESuite.ai App <%= csrf_meta_tags %> <%= csp_meta_tag %> diff --git a/app/views/user_mailer/project_invitation.html.erb b/app/views/user_mailer/project_invitation.html.erb index e17fd22..1b2f2e9 100644 --- a/app/views/user_mailer/project_invitation.html.erb +++ b/app/views/user_mailer/project_invitation.html.erb @@ -10,5 +10,5 @@

- If you have questions about how to use the software, please visit <%= link_to "BiGMedia.ai", "https://www.bigmedia.ai/contact" %>. + If you have questions about how to use the software, please visit <%= link_to "MESuite.ai", "https://www.mesuite.ai/contact" %>.

diff --git a/app/views/user_mailer/project_invitation.text.erb b/app/views/user_mailer/project_invitation.text.erb index 217fbd7..48bc963 100644 --- a/app/views/user_mailer/project_invitation.text.erb +++ b/app/views/user_mailer/project_invitation.text.erb @@ -7,4 +7,4 @@ Please click below to set your password. <%= edit_password_reset_url(id: @user.password_reset_token, host: AppHost.new.domain_with_port) %> <% end %> -If you have questions about how to use the software, please visit https://www.bigmedia.ai/contact. +If you have questions about how to use the software, please visit https://www.mesuite.ai/contact. diff --git a/db/structure.sql b/db/structure.sql index 6a85008..e62fb76 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -9,20 +9,6 @@ SET xmloption = content; SET client_min_messages = warning; SET row_security = off; --- --- Name: plpgsql; Type: EXTENSION; Schema: -; Owner: - --- - -CREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog; - - --- --- Name: EXTENSION plpgsql; Type: COMMENT; Schema: -; Owner: - --- - -COMMENT ON EXTENSION plpgsql IS 'PL/pgSQL procedural language'; - - -- -- Name: fuzzystrmatch; Type: EXTENSION; Schema: -; Owner: - -- @@ -1479,6 +1465,7 @@ CREATE TABLE public.settings ( -- CREATE SEQUENCE public.settings_id_seq + AS integer START WITH 1 INCREMENT BY 1 NO MINVALUE @@ -1514,6 +1501,7 @@ CREATE TABLE public.taggings ( -- CREATE SEQUENCE public.taggings_id_seq + AS integer START WITH 1 INCREMENT BY 1 NO MINVALUE @@ -1544,6 +1532,7 @@ CREATE TABLE public.tags ( -- CREATE SEQUENCE public.tags_id_seq + AS integer START WITH 1 INCREMENT BY 1 NO MINVALUE diff --git a/spec/features/user_managing_videos_spec.rb b/spec/features/user_managing_videos_spec.rb index ca5bec6..23559e8 100644 --- a/spec/features/user_managing_videos_spec.rb +++ b/spec/features/user_managing_videos_spec.rb @@ -40,7 +40,7 @@ feature "User managing videos" do expect(page).to have_selector "#video_edl_file", visible: :all expect(page).to have_selector "#video_graphics_only_edl_file", visible: :all expect(page).to have_selector "#video_audio_only_edl_file", visible: :all - expect(page).to have_link "click here", href: /mailto:info@bigmedia\.ai/ + expect(page).to have_link "click here", href: /mailto:info@mesuite\.ai/ fill_in_video_fields name: "New name", number: "99" diff --git a/spec/helpers/mail_helper_spec.rb b/spec/helpers/mail_helper_spec.rb index 6ac54d1..03c8f3d 100644 --- a/spec/helpers/mail_helper_spec.rb +++ b/spec/helpers/mail_helper_spec.rb @@ -8,7 +8,7 @@ RSpec.describe MailHelper, type: :helper do link = CGI.unescape helper.mail_to_for_multiple_edls("test content", project) expect(link).to match "test content" - expect(link).to match "info@bigmedia.ai" + expect(link).to match "info@mesuite.ai" expect(link).to match /Multiple Adobe Premiere EDLs needed for Test Account's Test Project project/ expect(link).to match "INSTRUCTIONS" end diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb index e6dd5f1..ac9874d 100644 --- a/spec/mailers/admin_mailer_spec.rb +++ b/spec/mailers/admin_mailer_spec.rb @@ -8,8 +8,8 @@ RSpec.describe AdminMailer do it "renders the headers" do expect(mail.subject).to eq("[New Video] Test Account has uploaded a new video") - expect(mail.to).to eq(["bray@bigmedia.ai", "lee@bigmedia.ai"]) - expect(mail.from).to eq(["support@bigmedia.ai"]) + expect(mail.to).to eq(["bray@mesuite.ai", "lee@mesuite.ai"]) + expect(mail.from).to eq(["support@mesuite.ai"]) end it "renders the body" do @@ -24,8 +24,8 @@ RSpec.describe AdminMailer do it "renders the headers" do expect(mail.subject).to eq("[Updated Video EDL File] Test Account has updated the EDL file for video_file.mp4") - expect(mail.to).to eq(["bray@bigmedia.ai", "lee@bigmedia.ai"]) - expect(mail.from).to eq(["support@bigmedia.ai"]) + expect(mail.to).to eq(["bray@mesuite.ai", "lee@mesuite.ai"]) + expect(mail.from).to eq(["support@mesuite.ai"]) end it "renders the body" do @@ -41,8 +41,8 @@ RSpec.describe AdminMailer do it "renders the headers" do expect(mail.subject).to eq("[Updated Video Graphics Only EDL File] Test Account has updated the Graphics Only EDL file for video_file.mp4") - expect(mail.to).to eq(["bray@bigmedia.ai", "lee@bigmedia.ai"]) - expect(mail.from).to eq(["support@bigmedia.ai"]) + expect(mail.to).to eq(["bray@mesuite.ai", "lee@mesuite.ai"]) + expect(mail.from).to eq(["support@mesuite.ai"]) end it "renders the body" do @@ -58,8 +58,8 @@ RSpec.describe AdminMailer do it "renders the headers" do expect(mail.subject).to eq("[Updated Video Audio Only EDL File] Test Account has updated the Audio Only EDL file for video_file.mp4") - expect(mail.to).to eq(["bray@bigmedia.ai", "lee@bigmedia.ai"]) - expect(mail.from).to eq(["support@bigmedia.ai"]) + expect(mail.to).to eq(["bray@mesuite.ai", "lee@mesuite.ai"]) + expect(mail.from).to eq(["support@mesuite.ai"]) end it "renders the body" do diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb index 1fad0b8..43a97db 100644 --- a/spec/mailers/user_mailer_spec.rb +++ b/spec/mailers/user_mailer_spec.rb @@ -8,7 +8,7 @@ describe UserMailer do it "renders the headers" do expect(mail.subject).to eq("Password reset") expect(mail.to).to eq([user.email]) - expect(mail.from).to eq(["support@bigmedia.ai"]) + expect(mail.from).to eq(["support@mesuite.ai"]) end it "renders the body" do @@ -24,7 +24,7 @@ describe UserMailer do it "renders the headers" do expect(mail.subject).to eq("You've been added to a project in the ME Suite") expect(mail.to).to eq([user.email]) - expect(mail.from).to eq(["support@bigmedia.ai"]) + expect(mail.from).to eq(["support@mesuite.ai"]) end it "renders the body" do @@ -50,7 +50,7 @@ describe UserMailer do it "renders the headers" do expect(mail.subject).to eq("Welcome to BiG") expect(mail.to).to eq([user.email]) - expect(mail.from).to eq(["support@bigmedia.ai"]) + expect(mail.from).to eq(["support@mesuite.ai"]) end it "renders the body" do diff --git a/spec/models/app_host_spec.rb b/spec/models/app_host_spec.rb index b3753cd..c03aaca 100644 --- a/spec/models/app_host_spec.rb +++ b/spec/models/app_host_spec.rb @@ -32,7 +32,7 @@ describe AppHost do app_domain = AppHost.new(env, "production") - expect(app_domain.domain).to eq("bigmedia.ai") + expect(app_domain.domain).to eq("mesuite.ai") end end end -- 2.47.3 From 015ed83ac2355319990cc9414a9e998b28736208 Mon Sep 17 00:00:00 2001 From: Bilal Date: Wed, 5 Aug 2020 10:27:06 +0200 Subject: [PATCH 2/2] fix MR comment --- app/mailers/admin_mailer.rb | 2 +- spec/mailers/admin_mailer_spec.rb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/mailers/admin_mailer.rb b/app/mailers/admin_mailer.rb index 5552e5f..575e12c 100644 --- a/app/mailers/admin_mailer.rb +++ b/app/mailers/admin_mailer.rb @@ -1,5 +1,5 @@ class AdminMailer < ApplicationMailer - default to: %w(bray@mesuite.ai lee@mesuite.ai) + default to: %w[bray@mesuite.ai] def new_video(video) @video = video diff --git a/spec/mailers/admin_mailer_spec.rb b/spec/mailers/admin_mailer_spec.rb index ac9874d..2240fcb 100644 --- a/spec/mailers/admin_mailer_spec.rb +++ b/spec/mailers/admin_mailer_spec.rb @@ -8,7 +8,7 @@ RSpec.describe AdminMailer do it "renders the headers" do expect(mail.subject).to eq("[New Video] Test Account has uploaded a new video") - expect(mail.to).to eq(["bray@mesuite.ai", "lee@mesuite.ai"]) + expect(mail.to).to eq(["bray@mesuite.ai"]) expect(mail.from).to eq(["support@mesuite.ai"]) end @@ -24,7 +24,7 @@ RSpec.describe AdminMailer do it "renders the headers" do expect(mail.subject).to eq("[Updated Video EDL File] Test Account has updated the EDL file for video_file.mp4") - expect(mail.to).to eq(["bray@mesuite.ai", "lee@mesuite.ai"]) + expect(mail.to).to eq(["bray@mesuite.ai"]) expect(mail.from).to eq(["support@mesuite.ai"]) end @@ -41,7 +41,7 @@ RSpec.describe AdminMailer do it "renders the headers" do expect(mail.subject).to eq("[Updated Video Graphics Only EDL File] Test Account has updated the Graphics Only EDL file for video_file.mp4") - expect(mail.to).to eq(["bray@mesuite.ai", "lee@mesuite.ai"]) + expect(mail.to).to eq(["bray@mesuite.ai"]) expect(mail.from).to eq(["support@mesuite.ai"]) end @@ -58,7 +58,7 @@ RSpec.describe AdminMailer do it "renders the headers" do expect(mail.subject).to eq("[Updated Video Audio Only EDL File] Test Account has updated the Audio Only EDL file for video_file.mp4") - expect(mail.to).to eq(["bray@mesuite.ai", "lee@mesuite.ai"]) + expect(mail.to).to eq(["bray@mesuite.ai"]) expect(mail.from).to eq(["support@mesuite.ai"]) end -- 2.47.3