Moved tests that didn't rely on javascript to requests

Author: Benjamin-Couey

spec/requests/organization_requests_spec.rb

@@ -123,6 +123,8 @@
         expect(html.text).to include("Logo")
         expect(html.text).to include("Use one-step Partner invite and approve process?")
         expect(html.text).to include("Receive email when Partner makes a Request?")
+        expect(html.text).not_to include("Your next reminder date is ")
+        expect(html.text).not_to include("The deadline on your next reminder email will be ")
       end
 
       it "displays the correct organization details" do
@@ -153,6 +155,31 @@
         end
       end
 
+      context "with a reminder schedule" do
+        before do
+          travel_to Time.zone.local(2020, 10, 10)
+          valid_reminder_schedule = ReminderScheduleService.new({
+            by_month_or_week: "day_of_month",
+            every_nth_month: 1,
+            day_of_month: 20
+          }).to_ical
+          organization.update(reminder_schedule_definition: valid_reminder_schedule)
+        end
+
+        it "reports the next date a reminder email will be sent" do
+          get organization_path
+          expect(response.body).to include "Your next reminder date is Tue Oct 20 2020."
+          expect(response.body).not_to include "The deadline on your next reminder email will be Sun Oct 25 2020."
+        end
+
+        it "reports the deadline date that will be included in the next reminder email" do
+          organization.update(deadline_day: 25)
+          get organization_path
+          expect(response.body).to include "Your next reminder date is Tue Oct 20 2020."
+          expect(response.body).to include "The deadline on your next reminder email will be Sun Oct 25 2020."
+        end
+      end
+
       it "cannot see 'Demote to User' button for admins" do
         expect(response.body).to_not include "Demote to User"
       end

spec/requests/partners_requests_spec.rb

@@ -16,9 +16,14 @@
     context "html" do
       let(:response_format) { 'html' }
 
-      let!(:partner) { create(:partner, organization: organization) }
+      let!(:partner) { create(:partner, organization: organization, name: "Partner One") }
 
-      it { is_expected.to be_successful }
+      it {
+        is_expected.to be_successful
+        expect(response.body).to include "Partner One"
+        expect(response.body).not_to include "Your next reminder date is Tue Oct 20 2020."
+        expect(response.body).not_to include "The deadline on your next reminder email will be Sun Oct 25 2020."
+      }
 
       include_examples "restricts access to organization users/admins"
     end

spec/system/organization_system_spec.rb

@@ -50,53 +50,6 @@
       sign_in(organization_admin)
     end
 
-    describe "Viewing the organization" do
-      it "can view organization details", :aggregate_failures do
-        organization.update!(one_step_partner_invite: true)
-
-        visit organization_path
-
-        expect(page.find("h1")).to have_text(organization.name)
-        expect(page).to have_link("Home", href: dashboard_path)
-
-        expect(page).to have_content("Basic information")
-        expect(page).to have_content("Storage")
-        expect(page).to have_content("Partner approval process")
-        expect(page).to have_content("What kind of Requests can approved Partners make?")
-        expect(page).to have_content("Other emails")
-        expect(page).to have_content("Printing")
-        expect(page).to have_content("Annual Survey")
-
-        expect(page).not_to have_content("Your next reminder date is ")
-        expect(page).not_to have_content("The deadline on your next reminder email will be ")
-      end
-
-      context "with a reminder schedule" do
-        before do
-          travel_to Time.zone.local(2020, 10, 10)
-          valid_reminder_schedule = ReminderScheduleService.new({
-            by_month_or_week: "day_of_month",
-            every_nth_month: 1,
-            day_of_month: 20
-          }).to_ical
-          organization.update(reminder_schedule_definition: valid_reminder_schedule)
-        end
-
-        it "reports the next date a reminder email will be sent" do
-          visit organization_path
-          expect(page).to have_content("Your next reminder date is Tue Oct 20 2020.")
-          expect(page).not_to have_content("The deadline on your next reminder email will be Sun Oct 25 2020.")
-        end
-
-        it "reports the deadline date that will be included in the next reminder email" do
-          organization.update(deadline_day: 25)
-          visit organization_path
-          expect(page).to have_content("Your next reminder date is Tue Oct 20 2020.")
-          expect(page).to have_content("The deadline on your next reminder email will be Sun Oct 25 2020.")
-        end
-      end
-    end
-
     describe "Editing the organization" do
       let(:partner) { create(:partner, organization: organization) }
 

spec/system/partner_system_spec.rb

@@ -612,29 +612,18 @@
         sign_in(user)
       end
 
-      let!(:item_category_1) { create(:item_category, name: "Category One", organization: organization) }
-      let!(:item_category_2) { create(:item_category, name: "Category Two", organization: organization) }
+      let!(:item_category_1) { create(:item_category, organization: organization) }
+      let!(:item_category_2) { create(:item_category, organization: organization) }
       let!(:items_in_category_1) { create_list(:item, 3, item_category_id: item_category_1.id) }
       let!(:items_in_category_2) { create_list(:item, 3, item_category_id: item_category_2.id) }
 
       describe 'viewing the partner groups' do
-        let!(:partner_group_1) { create(:partner_group, name: "Group One", organization: organization) }
-        let!(:partner_1) { create(:partner, name: "Partner One", partner_group: partner_group_1) }
+        let!(:partner_group_1) { create(:partner_group, organization: organization) }
+        let!(:partner_1) { create(:partner, partner_group: partner_group_1) }
         before do
           partner_group_1.item_categories << item_category_1
         end
 
-        it "shows the name, member partners, and item categories" do
-          visit partners_path
-          click_on 'Groups'
-          expect(page).to have_content("Group One")
-          expect(page).to have_content("Partner One")
-          expect(page).to have_content("Category One")
-
-          expect(page).not_to have_content("Your next reminder date is Tue Oct 20 2020.")
-          expect(page).not_to have_content("The deadline on your next reminder email will be Sun Oct 25 2020.")
-        end
-
         context "with a reminder schedule" do
           before do
             travel_to Time.zone.local(2020, 10, 10)