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

test/fixtures/checks.yml

@@ -2,18 +2,21 @@
 
 one:
   position: MyString
-  name: MyString
+  name_de: MyString
   level: 1
   number: 1
+  principle: one
 
 two:
   position: MyString
-  name: MyString
+  name_de: MyString
   level: 1
   number: 2
+  principle: one
 
 deletable:
   position: MyString
-  name: MyString
+  name_de: MyString
   level: 1
   number: 3
+  principle: one

test/fixtures/elements.yml

@@ -1,13 +1,11 @@
 # Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  report: one
-  path: MyString
+  page: one
   title: MyString
-  # description: MyText
+  position: 1
 
 two:
-  report: two
-  path: MyString
+  page: two
   title: MyString
-  # description: MyText
+  position: 2

test/fixtures/success_criteria.yml

@@ -5,9 +5,13 @@ one:
   title: MyString
   level: 1
   result: 1
+  position: 1
+  check: one
 
 two:
   element: two
   title: MyString
   level: 1
   result: 1
+  position: 2
+  check: two

test/system/elements_test.rb

@@ -13,13 +13,13 @@ class ElementsTest < ApplicationSystemTestCase
   end
 
   test "visiting the index" do
-    visit elements_url
+    visit page_elements_url(@element.page)
     assert_selector "h1", text: "Elemente"
   end
 
   test "should create element" do
     skip
-    visit elements_url
+    visit page_elements_url(@element.page)
     click_on "Element hinzufügen"
 
     assert_difference("Element.count", 1) do
@@ -35,9 +35,6 @@ class ElementsTest < ApplicationSystemTestCase
   test "should update Element" do
     visit element_url(@element)
     click_on "Element bearbeiten", match: :first
-
-    fill_in_rich_text_area "Details", with: @element.description_html
-    fill_in "Pfad", with: @element.path
     fill_in "Beschreibung", with: @element.title
     click_on "Element aktualisieren"
   end

test/system/pages_test.rb

@@ -3,45 +3,43 @@ require "application_system_test_case"
 class PagesTest < ApplicationSystemTestCase
   setup do
     @page = pages(:one)
+    login_test
+  end
+
+  teardown do
+    logout
   end
 
   test "visiting the index" do
-    visit pages_url
-    assert_selector "h1", text: "Pages"
+    visit report_pages_url(@page.report)
+    assert_selector "h1", text: "Pfade"
   end
 
   test "should create page" do
-    visit pages_url
-    click_on "New page"
+    visit report_pages_url(@page.report)
+    click_on "Pfad hinzufügen"
 
-    fill_in "Path", with: @page.path
-    fill_in "Position", with: @page.position
-    fill_in "Report", with: @page.report_id
+    fill_in "Name", with: @page.path
     fill_in "Url", with: @page.url
-    click_on "Create Page"
+    click_on "Pfad erstellen"
 
-    assert_text "Page was successfully created"
-    click_on "Back"
+    assert_text "Prüfbericht bearbeiten"
   end
 
   test "should update Page" do
     visit page_url(@page)
-    click_on "Edit this page", match: :first
+    click_on "Pfad bearbeiten", match: :first
 
-    fill_in "Path", with: @page.path
-    fill_in "Position", with: @page.position
-    fill_in "Report", with: @page.report_id
+    fill_in "Name", with: @page.path
     fill_in "Url", with: @page.url
-    click_on "Update Page"
-
-    assert_text "Page was successfully updated"
-    click_on "Back"
+    click_on "Pfad aktualisieren"
   end
 
   test "should destroy Page" do
     visit page_url(@page)
-    click_on "Destroy this page", match: :first
+    click_on "Pfad löschen", match: :first
 
-    assert_text "Page was successfully destroyed"
+    assert_text "Pfad hinzufügen"
+    assert(Page.exists?(@page.id) == false)
   end
 end

test/system/reports_test.rb

@@ -38,7 +38,7 @@ class ReportsTest < ApplicationSystemTestCase
   test "should destroy Report" do
     visit report_url(@report)
     click_on "Prüfbericht löschen", match: :first
-    assert_text("Report was successfully destroyed")
+    assert_text("Prüfberichte")
     assert(Report.exists?(@report.id) == false)
   end
 end

test/system/success_criteria_test.rb

@@ -8,21 +8,27 @@ class SuccessCriteriaTest < ApplicationSystemTestCase
   end
 
   setup do
+    @check = checks(:one)
+    @check.update!(name_de: "Testcheck")
     @success_criterion = success_criteria(:one)
+    @success_criterion.check = @check
+    @success_criterion.save!
     login_test
   end
 
   test "visiting the index" do
-    visit success_criteria_url
+    visit element_success_criteria_url(@success_criterion.element)
     assert_selector "h1", text: "Erfolgskriterien"
   end
 
   test "should create Erfolgskriterium" do
-    visit success_criteria_url
+    visit element_success_criteria_url(@success_criterion.element)
     click_on "Erfolgskriterium hinzufügen"
 
-    fill_in_rich_text_area "Testkommentar", with: @success_criterion.comment
-    fill_in_rich_text_area "Richtlinie", with: @success_criterion.description_html
+    select @check.name_de, from: "Check"
+
+    # fill_in_rich_text_area "Testkommentar", with: @success_criterion.test_comment
+    # fill_in_rich_text_area "Quick Kriterium", with: @success_criterion.quick_criterion
     # fill_in 'Element', with: @success_criterion.element_id
     # fill_in 'Level', with: @success_criterion.level
     # fill_in 'Result', with: @success_criterion.result
@@ -34,8 +40,8 @@ class SuccessCriteriaTest < ApplicationSystemTestCase
     visit success_criterion_url(@success_criterion)
     click_on "Erfolgskriterium bearbeiten", match: :first
 
-    fill_in_rich_text_area "Testkommentar", with: @success_criterion.comment
-    fill_in_rich_text_area "Richtlinie", with: @success_criterion.description_html
+    fill_in_rich_text_area "Testkommentar", with: @success_criterion.test_comment
+    fill_in_rich_text_area "Quick Kriterium", with: @success_criterion.quick_criterion
     find("label", text: "Bestanden", visible: true).click
     fill_in "Titel", with: "new"
     click_on "Erfolgskriterium aktualisieren"