Dismiss modal on successful email / SMS form submission

Co-authored-by: Nikitas Tampakis <nikitas.tampakis@gmail.com>
projectblacklight · Mar 29, 2018 · 23371bd · 23371bd
1 parent 7720668
commit 23371bd
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 18 deletions.
diff --git a/app/views/catalog/email_success.html.erb b/app/views/catalog/email_success.html.erb
@@ -1,11 +1,13 @@
-<div class="modal-header">
-  <h1><%= t('blacklight.email.form.title') %></h1>
-  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-    <span aria-hidden="true">&times;</span>
-  </button>
-</div>
+<div data-blacklight-modal="container">
+  <div class="modal-header">
+    <h1><%= t('blacklight.email.form.title') %></h1>
+    <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
 
-<div class="modal-body">
-  <%= render partial: '/shared/flash_msg' %>
-  <span data-blacklight-modal="close"></span>
+  <div class="modal-body">
+    <%= render partial: '/shared/flash_msg' %>
+    <span data-blacklight-modal="close"></span>
+  </div>
 </div>
diff --git a/app/views/catalog/sms_success.html.erb b/app/views/catalog/sms_success.html.erb
@@ -1,11 +1,13 @@
-<div class="modal-header">
-  <h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
-  <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
-    <span aria-hidden="true">&times;</span>
-  </button>
-</div>
+<div data-blacklight-modal="container">
+  <div class="modal-header">
+    <h1 class="modal-title"><%= t('blacklight.sms.form.title') %></h1>
+    <button type="button" class="blacklight-modal-close close" data-dismiss="modal" aria-label="<%= t('blacklight.modal.close') %>">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
 
-<div class="modal-body">
-  <%= render partial: '/shared/flash_msg' %>
-  <span data-blacklight-modal="close"></span>
+  <div class="modal-body">
+    <%= render partial: '/shared/flash_msg' %>
+    <span data-blacklight-modal="close"></span>
+  </div>
 </div>
diff --git a/spec/views/catalog/email_success.html.erb_spec.rb b/spec/views/catalog/email_success.html.erb_spec.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec.describe "catalog/email_success.html.erb" do
+
+  it "includes the data-blacklight-modal properties" do
+    render
+    expect(rendered).to have_selector "div[data-blacklight-modal=container]"
+  end
+end
diff --git a/spec/views/catalog/sms_success.html.erb_spec.rb b/spec/views/catalog/sms_success.html.erb_spec.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RSpec.describe "catalog/sms_success.html.erb" do
+
+  it "includes the data-blacklight-modal properties" do
+    render
+    expect(rendered).to have_selector "div[data-blacklight-modal=container]"
+  end
+end