straighten up tests

econya · Oct 7, 2020 · fa4c61f · fa4c61f
1 parent ce22d07
commit fa4c61f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 20 deletions.
diff --git a/test/controllers/pages_controller_test.rb b/test/controllers/pages_controller_test.rb
@@ -10,36 +10,25 @@ class PagesControllerTest < ActionDispatch::IntegrationTest
     assert_response :success
   end
 
-  test "shows rendered about_us page" do
-    terms_setting = SiteSetting.find_or_create_by(key: 'about_us',
-                                                  value: '# about us head',
-                                                  kind: 'markdown')
-
-    get about_us_path
-
-    assert_select 'h1', 'about us head'
-    assert_response :success
-  end
-
   test "shows rendered term page" do
-    terms_setting = SiteSetting.find_or_create_by(key: 'terms',
-                                                  value: '# term-heading',
-                                                  kind: 'markdown')
+    terms_setting = SiteSetting.find_or_create_by(key: 'terms')
+    terms_setting.update!(value: '# term-heading', kind: 'markdown')
 
     get terms_path
 
     assert_select 'h1', 'term-heading'
+
     assert_response :success
   end
 
   test "shows rendered privacy statement page" do
-    terms_setting = SiteSetting.find_or_create_by(key: 'privacy_statement',
-                                                  value: '# privacy',
-                                                  kind: 'markdown')
+    privacy_setting = SiteSetting.find_or_create_by(key: 'privacy_statement')
+    privacy_setting.update!(value: '## privacy', kind: 'markdown')
 
     get privacy_path
 
-    assert_select 'h1', 'privacy'
+    assert_select 'h2', 'privacy'
+
     assert_response :success
   end
 end
diff --git a/test/helpers/user_access_helper_test.rb b/test/helpers/user_access_helper_test.rb
@@ -6,8 +6,10 @@
 
 class UserAccessHelperTest < ActionView::TestCase
   test "#days_till_end_of_subscription" do
-    sue = User.create(email: '[email protected]', password: 'password',
-                      password_confirmation: 'password', confirmed_at: DateTime.now)
+    sue = User.create!(email: '[email protected]', password: 'password',
+                      password_confirmation: 'password',
+                      tos_agreement: true, read_privacy_terms: true,
+                      confirmed_at: DateTime.now)
     assert_nil days_till_end_of_subscription(sue)
 
     sue.subscriptions.create(date_start: DateTime.now - 1.hours, date_end: DateTime.now + 4.days)