Turn up the verbosity of CI tests

.github/workflows/django.yml

@@ -10,14 +10,6 @@ jobs:
   build:
     if: "!contains(github.event.head_commit.message, '[ci skip]')"
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        python: [3.9]
-        experimental: [false]
-        include:
-          - python: 3.10.0-alpha.5
-            experimental: true
-    continue-on-error: ${{ matrix.experimental }}
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
@@ -35,7 +27,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-            python-version: ${{ matrix.python }}
+            python-version: 3.9
       - name: Cache python deps
         uses: actions/cache@v2
         with:
@@ -53,7 +45,7 @@ jobs:
               pipenv run python manage.py makemigrations --check --dry-run
               pipenv run python manage.py collectstatic --noinput
       - name: Run Tests
-        run: pipenv run pytest --cov -n auto
+        run: pipenv run pytest -n auto -vv --cov
       - uses: actions/upload-artifact@v2
         if: failure()
         with:

RIGS/templates/partials/event_status.html

@@ -1,12 +1,14 @@
-<h5>
+<div>
 <span class="badge badge-{% if event.confirmed %}success{% elif event.cancelled %}dark{% else %}warning{% endif %}">Status: {{ event.get_status_display }}</span>
 {% if event.is_rig %}
-    {% if event.purchase_order %}
-        <span class="badge badge-success">PO: {{ event.purchase_order }}</span>
-    {% elif event.authorised %}
-        <span class="badge badge-success">Authorisation: Complete <span class="fas fa-check"></span></span>
-    {% else %}
-        <span class="badge badge-danger">Authorisation: <span class="fas fa-times"></span></span>
+    {% if event.sum_total > 0 %}
+        {% if event.purchase_order %}
+            <span class="badge badge-success">PO: {{ event.purchase_order }}</span>
+        {% elif event.authorised %}
+            <span class="badge badge-success">Authorisation: Complete <span class="fas fa-check"></span></span>
+        {% else %}
+            <span class="badge badge-danger">Authorisation: <span class="fas fa-times"></span></span>
+        {% endif %}
     {% endif %}
     {% if not event.dry_hire %}
         {% if event.riskassessment %}
@@ -14,8 +16,6 @@
         {% else %}
             <span class="badge badge-danger">RA: <span class="fas fa-times"></span></span>
         {% endif %}
-    {% else %}
-        <span class="badge badge-secondary">RA: N/A</span>
     {% endif %}
     {% if not event.dry_hire %}
         {% if event.hs_done %}
@@ -24,8 +24,6 @@
         {% else %}
             <span class="badge badge-danger">Checklist: <span class="fas fa-times"></span></span>
         {% endif %}
-    {% else %}
-        <span class="badge badge-secondary">Checklist: N/A</span>
     {% endif %}
     {% if perms.RIGS.view_invoice %}
         {% if event.invoice %}
@@ -41,4 +39,4 @@
         {% endif %}
     {% endif %}
 {% endif %}
-</h5>
+</div>

RIGS/templates/partials/event_table.html

@@ -25,7 +25,7 @@
                         {% endif %}
                     {% else %}
                     table-warning
-                    {% endif %}" id="event_row">
+                    {% endif %}" {% if event.cancelled %}style="opacity: 50% !important;"{% endif %} id="event_row">
             <!---Number-->
             <th scope="row" id="event_number">{{ event.display_id }}</th>
             <!--Dates & Times-->

RIGS/templates/rigboard.html

@@ -2,9 +2,9 @@
 {% load button from filters %}
 
 {% block content %}
-<div class="row align-items-center justify-content-between py-2">
-    <div class="col-sm-12 col-md">
-        Key: <span class="table-success mr-1 px-2">Ready</span><span class="table-warning mr-1 px-2">Action Required</span><span class="table-danger mr-1 px-2">Needs MIC</span><span class="table-secondary mr-1 px-2">Cancelled</span><span class="table-info px-2">Non-Rig</span>
+<div class="row align-items-center justify-content-between py-2 align-middle">
+    <div class="col-sm-12 col-md align-middle">
+        Key: <span class="table-success mr-1 px-2 rounded">Ready</span><span class="table-warning mr-1 px-2 rounded">Action Required</span><span class="table-danger mr-1 px-2 rounded">Needs MIC</span><span class="table-secondary mr-1 px-2 rounded">Cancelled</span><span class="table-info px-2 rounded">Non-Rig</span>
     </div>
     {% if perms.RIGS.add_event %}
     <div class="col text-right">

RIGS/tests/pages.py

@@ -279,7 +279,7 @@ class CreateEventChecklist(FormPage):
 class EditEventChecklist(CreateEventChecklist):
     URL_TEMPLATE = '/event/checklist/{pk}/edit'
     _vehicle_row_locator = ('xpath', "//tr[@id[starts-with(., 'vehicle') and not(contains(.,'new'))]]")
-    _crew_row_locator = ('xpath', "//tr[@id[starts-with(., 'crew') and not(contains(. 'new'))]]")
+    _crew_row_locator = ('xpath', "//tr[@id[starts-with(., 'crew') and not(contains(.,'new'))]]")
 
     @property
     def vehicles(self):
@@ -297,6 +297,32 @@ class EditEventChecklist(CreateEventChecklist):
         def vehicle(self):
             return regions.BootstrapSelectElement(self, self.root.find_element(*self._select_locator))
 
+    @property
+    def crew(self):
+        return [self.CrewRow(self, el) for el in self.find_elements(*self._crew_row_locator)]
+
+    class CrewRow(Region):
+        _select_locator = ('xpath', ".//div[contains(@class,'bootstrap-select')]/..")
+        _start_time_locator = ('xpath', ".//input[@name[starts-with(., 'start') and not(contains(.,'new'))]]")
+        _end_time_locator = ('xpath', ".//input[@name[starts-with(., 'end') and not(contains(.,'new'))]]")
+        _role_locator = ('xpath', ".//input[@name[starts-with(., 'role') and not(contains(.,'new'))]]")
+
+        @property
+        def crewmember(self):
+            return regions.BootstrapSelectElement(self, self.root.find_element(*self._select_locator))
+
+        @property
+        def start_time(self):
+            return regions.DateTimePicker(self, self.root.find_element(*self._start_time_locator))
+
+        @property
+        def end_time(self):
+            return regions.DateTimePicker(self, self.root.find_element(*self._end_time_locator))
+
+        @property
+        def role(self):
+            return regions.TextBox(self, self.root.find_element(*self._role_locator))
+
     @property
     def success(self):
         return 'edit' not in self.driver.current_url

RIGS/tests/test_interaction.py

@@ -748,152 +748,74 @@ def test_ec_create_vehicle(logged_in_browser, live_server, admin_user, checklist
     assert vehicle_name == vehicle.vehicle
 
 
-# FIXME
-@pytest.mark.xfail(run=False)
+# TODO Test validation of end before start
 def test_ec_create_crew(logged_in_browser, live_server, admin_user, checklist):
     page = pages.EditEventChecklist(logged_in_browser.driver, live_server.url, pk=checklist.pk).open()
     page.add_crew()
+    assert len(page.crew) == 1
     role = "MIC"
-    crew_select = base_regions.BootstrapSelectElement(page, logged_in_browser.find_by_xpath('//tr[@id="crew_-1"]//div[contains(@class, "bootstrap-select")]')[0])
-    start_time = base_regions.DateTimePicker(page, logged_in_browser.find_by_xpath('//*[@name="start_-1"]')[0])
-    end_time = base_regions.DateTimePicker(page, logged_in_browser.find_by_xpath('//*[@name="end_-1"]')[0])
-
-    start_time.set_value(timezone.make_aware(datetime.datetime(2015, 1, 1, 9, 0)))
-    # TODO Test validation of end before start
-    end_time.set_value(timezone.make_aware(datetime.datetime(2015, 1, 1, 10, 30)))
-    crew_select.search(admin_user.name)
-    logged_in_browser.find_by_xpath('//*[@name="role_-1"]').send_keys(role)
-
+    start_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 9, 0))
+    end_time = timezone.make_aware(datetime.datetime(2015, 1, 1, 10, 30))
+    crew = page.crew[0]
+    crew.role.set_value(role)
+    crew.start_time.set_value(start_time)
+    crew.end_time.set_value(end_time)
+    crew.crewmember.search(admin_user.first_name)
     page.submit()
     assert page.success
-    checklist.refresh_from_db()
-
+    # Check data is correct
     crew_obj = models.EventChecklistCrew.objects.get(checklist=checklist.pk)
     assert admin_user.pk == crew_obj.crewmember.pk
     assert role == crew_obj.role
+    assert start_time == crew_obj.start
+    assert end_time == crew_obj.end
 
 
-@screenshot_failure_cls
-class TestHealthAndSafety(BaseRigboardTest):
-    def setUp(self):
-        super().setUp()
-        self.profile = models.Profile.objects.get_or_create(
-            first_name='Test',
-            last_name='TEC User',
-            username='eventtest',
-            email='teccie@functional.test',
-            is_superuser=True  # lazily grant all permissions
-        )[0]
-        self.venue = models.Venue.objects.create(name="Venue 1")
+# TODO Can I loop through all the boolean fields and test them at once?
+def test_ra_creation(logged_in_browser, live_server, admin_user, basic_event):
+    page = pages.CreateRiskAssessment(logged_in_browser.driver, live_server.url, event_id=basic_event.pk).open()
 
-        self.testEvent = models.Event.objects.create(name="TE E1", status=models.Event.PROVISIONAL,
-                                                     start_date=date.today() + timedelta(days=6),
-                                                     description="start future no end",
-                                                     purchase_order='TESTPO',
-                                                     person=self.client,
-                                                     venue=self.venue)
-        self.testEvent2 = models.Event.objects.create(name="TE E2", status=models.Event.PROVISIONAL,
-                                                      start_date=date.today() + timedelta(days=6),
-                                                      description="start future no end",
-                                                      purchase_order='TESTPO',
-                                                      person=self.client,
-                                                      venue=self.venue)
-        self.testEvent3 = models.Event.objects.create(name="TE E3", status=models.Event.PROVISIONAL,
-                                                      start_date=date.today() + timedelta(days=6),
-                                                      description="start future no end",
-                                                      purchase_order='TESTPO',
-                                                      person=self.client,
-                                                      venue=self.venue)
-        self.testRA = models.RiskAssessment.objects.create(event=self.testEvent2, supervisor_consulted=False, nonstandard_equipment=False,
-                                                           nonstandard_use=False,
-                                                           contractors=False,
-                                                           other_companies=False,
-                                                           crew_fatigue=False,
-                                                           big_power=False,
-                                                           generators=False,
-                                                           other_companies_power=False,
-                                                           nonstandard_equipment_power=False,
-                                                           multiple_electrical_environments=False,
-                                                           noise_monitoring=False,
-                                                           known_venue=True,
-                                                           safe_loading=True,
-                                                           safe_storage=True,
-                                                           area_outside_of_control=False,
-                                                           barrier_required=False,
-                                                           nonstandard_emergency_procedure=False,
-                                                           special_structures=False,
-                                                           suspended_structures=False,
-                                                           outside=False)
-        self.testRA2 = models.RiskAssessment.objects.create(event=self.testEvent3, supervisor_consulted=False, nonstandard_equipment=False,
-                                                            nonstandard_use=False,
-                                                            contractors=False,
-                                                            other_companies=False,
-                                                            crew_fatigue=False,
-                                                            big_power=True,
-                                                            generators=False,
-                                                            other_companies_power=False,
-                                                            nonstandard_equipment_power=False,
-                                                            multiple_electrical_environments=False,
-                                                            noise_monitoring=False,
-                                                            known_venue=True,
-                                                            safe_loading=True,
-                                                            safe_storage=True,
-                                                            area_outside_of_control=False,
-                                                            barrier_required=False,
-                                                            nonstandard_emergency_procedure=False,
-                                                            special_structures=False,
-                                                            suspended_structures=False,
-                                                            outside=False)
-        self.page = pages.EventDetail(self.driver, self.live_server_url, event_id=self.testEvent.pk).open()
+    # Check there are no defaults
+    assert page.nonstandard_equipment is None
 
-    # TODO Can I loop through all the boolean fields and test them at once?
-    def test_ra_creation(self):
-        self.page = pages.CreateRiskAssessment(self.driver, self.live_server_url, event_id=self.testEvent.pk).open()
+    # No database side validation, only HTML5.
+    page.nonstandard_equipment = False
+    page.nonstandard_use = False
+    page.contractors = False
+    page.other_companies = False
+    page.crew_fatigue = False
+    page.general_notes = "There are no notes."
+    page.big_power = False
+    page.outside = False
+    page.power_mic.search(admin_user.first_name)
+    page.generators = False
+    page.other_companies_power = False
+    page.nonstandard_equipment_power = False
+    page.multiple_electrical_environments = False
+    page.power_notes = "Remember to bring some power"
+    page.noise_monitoring = False
+    page.sound_notes = "Loud, but not too loud"
+    page.known_venue = False
+    page.safe_loading = False
+    page.safe_storage = False
+    page.area_outside_of_control = False
+    page.barrier_required = False
+    page.nonstandard_emergency_procedure = False
+    page.special_structures = False
+    # self.page.persons_responsible_structures = "Nobody and her cat, She"
 
-        # Check there are no defaults
-        self.assertIsNone(self.page.nonstandard_equipment)
+    page.suspended_structures = True
+    # TODO Test for this proper
+    page.rigging_plan = "https://nottinghamtec.sharepoint.com/test/"
+    page.submit()
+    assert not page.success
 
-        # No database side validation, only HTML5.
+    page.suspended_structures = False
+    page.submit()
+    assert page.success
 
-        self.page.nonstandard_equipment = False
-        self.page.nonstandard_use = False
-        self.page.contractors = False
-        self.page.other_companies = False
-        self.page.crew_fatigue = False
-        self.page.general_notes = "There are no notes."
-        self.page.big_power = False
-        self.page.outside = False
-        self.page.power_mic.search(self.profile.name)
-        self.page.power_mic.set_option(self.profile.name, True)
-        # TODO This should not be necessary, normally closes automatically
-        self.page.power_mic.toggle()
-        self.assertFalse(self.page.power_mic.is_open)
-        self.page.generators = False
-        self.page.other_companies_power = False
-        self.page.nonstandard_equipment_power = False
-        self.page.multiple_electrical_environments = False
-        self.page.power_notes = "Remember to bring some power"
-        self.page.noise_monitoring = False
-        self.page.sound_notes = "Loud, but not too loud"
-        self.page.known_venue = False
-        self.page.safe_loading = False
-        self.page.safe_storage = False
-        self.page.area_outside_of_control = False
-        self.page.barrier_required = False
-        self.page.nonstandard_emergency_procedure = False
-        self.page.special_structures = False
-        # self.page.persons_responsible_structures = "Nobody and her cat, She"
 
-        self.page.suspended_structures = True
-        # TODO Test for this proper
-        self.page.rigging_plan = "https://nottinghamtec.sharepoint.com/test/"
-        self.page.submit()
-        self.assertFalse(self.page.success)
-
-        self.page.suspended_structures = False
-        self.page.submit()
-        self.assertTrue(self.page.success)
-
-        # Test that we can't make another one
-        self.page = pages.CreateRiskAssessment(self.driver, self.live_server_url, event_id=self.testEvent.pk).open()
-        self.assertIn('edit', self.driver.current_url)
+def test_ra_no_duplicates(logged_in_browser, live_server, admin_user, ra):
+    # Test that we can't make another one
+    page = pages.CreateRiskAssessment(logged_in_browser.driver, live_server.url, event_id=ra.event.pk).open()
+    assert 'edit' in logged_in_browser.url