Refactorings and gui improvements

test/controllers/elements_controller_test.rb

@@ -25,20 +25,19 @@ class ElementsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should get index" do
-    get elements_url
+    get page_elements_url(@element.page)
     assert_response :success
   end
 
   test "should get new" do
-    get new_element_url
+    get new_page_element_url(@element.page)
     assert_response :success
   end
 
   test "should create element" do
     assert_difference("Element.count") do
-      post elements_url,
-           params: { element: { description_html: @element.description_html, path: @element.path, report_id: @element.report_id,
-                                title: @element.title, checklist_id: @checklist.id } }
+      post page_elements_url(@element.page),
+           params: { element: { description: @element.description, title: @element.title, checklist_id: @checklist.id } }
     end
 
     assert_redirected_to report_url(Element.last.report)
@@ -56,7 +55,7 @@ class ElementsControllerTest < ActionDispatch::IntegrationTest
 
   test "should update element" do
     patch element_url(@element),
-          params: { element: { description_html: @element.description_html, path: @element.path, report_id: @element.report_id,
+          params: { element: { description: @element.description, page_id: @element.page_id,
                                title: @element.title } }
     assert_redirected_to element_url(@element)
   end
@@ -66,6 +65,6 @@ class ElementsControllerTest < ActionDispatch::IntegrationTest
       delete element_url(@element)
     end
 
-    assert_redirected_to elements_url
+    assert_redirected_to page_elements_url(@element.page)
   end
 end

test/controllers/pages_controller_test.rb

@@ -1,26 +1,42 @@
 require "test_helper"
 
 class PagesControllerTest < ActionDispatch::IntegrationTest
+  def login(email, password)
+    post "/login", params: { email: email, password: password }
+    assert_redirected_to "/"
+  end
+
+  def logout
+    post "/logout"
+    assert_redirected_to "/"
+  end
+
+  teardown do
+    logout
+  end
+
   setup do
+    Account.create(email: "test@example.com", password: "password")
     @page = pages(:one)
+    login("test@example.com", "password")
   end
 
   test "should get index" do
-    get pages_url
+    get report_pages_url(@page.report)
     assert_response :success
   end
 
   test "should get new" do
-    get new_page_url
+    get new_report_page_url(@page.report)
     assert_response :success
   end
 
   test "should create page" do
     assert_difference("Page.count") do
-      post pages_url, params: { page: { path: @page.path, position: @page.position, report_id: @page.report_id, url: @page.url } }
+      post report_pages_url(@page.report), params: { page: { path: @page.path, position: @page.position + 1, url: @page.url } }
     end
 
-    assert_redirected_to page_url(Page.last)
+    assert_redirected_to report_url(Page.last.report, page_id: Page.last)
   end
 
   test "should show page" do
@@ -40,9 +56,10 @@ class PagesControllerTest < ActionDispatch::IntegrationTest
 
   test "should destroy page" do
     assert_difference("Page.count", -1) do
+      Rails.logger.level = :debug
       delete page_url(@page)
     end
 
-    assert_redirected_to pages_url
+    assert_redirected_to report_pages_url(@page.report)
   end
 end

test/controllers/success_criteria_controller_test.rb

@@ -24,20 +24,19 @@ class SuccessCriteriaControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should get index" do
-    get success_criteria_url
+    get element_success_criteria_url(@success_criterion.element)
     assert_response :success
   end
 
   test "should get new" do
-    get new_success_criterion_url
+    get new_element_success_criterion_url(@success_criterion.element)
     assert_response :success
   end
 
   test "should create success_criterion" do
     assert_difference("SuccessCriterion.count") do
-      post success_criteria_url,
-           params: { success_criterion: { comment: @success_criterion.comment,
-                                          description_html: @success_criterion.description_html, element_id: @success_criterion.element_id, level: @success_criterion.level, result: @success_criterion.result, title: @success_criterion.title } }
+      post element_success_criteria_url(@success_criterion.element),
+           params: { success_criterion: { check_id: @success_criterion.check_id } }
     end
 
     assert_redirected_to success_criterion_url(SuccessCriterion.last)
@@ -55,8 +54,7 @@ class SuccessCriteriaControllerTest < ActionDispatch::IntegrationTest
 
   test "should update success_criterion" do
     patch success_criterion_url(@success_criterion),
-          params: { success_criterion: { comment: @success_criterion.comment,
-                                         description_html: @success_criterion.description_html, element_id: @success_criterion.element_id, level: @success_criterion.level, result: @success_criterion.result, title: @success_criterion.title } }
+          params: { success_criterion: { test_comment: @success_criterion.test_comment, level: @success_criterion.level, result: @success_criterion.result, title: @success_criterion.title } }
     assert_redirected_to success_criterion_url(@success_criterion)
   end
 
@@ -65,6 +63,6 @@ class SuccessCriteriaControllerTest < ActionDispatch::IntegrationTest
       delete success_criterion_url(@success_criterion)
     end
 
-    assert_redirected_to success_criteria_url
+    assert_redirected_to element_success_criteria_url(@success_criterion.element)
   end
 end