Merge ef8421b into 266b6ee

cypress/integration/organisation/edit.feature

@@ -0,0 +1,20 @@
+Feature: Editing a organisation
+  Background:
+    Given the user is logged in
+
+  @organisation
+  Scenario: The user should be able to make a public organization private
+    Given a public organization exists
+      And the user is on the edit organization page
+    When the user selects "None" Public Access
+      And the user submits the form
+    Then the organization should not be publicly visible
+
+  @organisation
+  Scenario: The user should be able to make a private organization public
+    Given a private organization exists
+      And the user is on the edit organization page
+    When the user selects "View" Public Access
+      And the user submits the form
+    Then the organization should be publicly visible
+

cypress/support/step_definitions/common/common.ts

@@ -4,10 +4,13 @@ import { After, Before, Given } from "cypress-cucumber-preprocessor/steps";
 import { customAlphabet } from "nanoid";
 import {
   getDictionaryId,
-  getUser, getVersionId,
+  getOrganisationId,
+  getUser,
+  getVersionId,
   isLoggedIn,
   setConceptId,
   setDictionaryId,
+  setOrganisationId,
   setVersionId
 } from "../../utils";
 
@@ -48,6 +51,9 @@ Before({ tags: "@version" }, () => {
   setVersionId(`Ver-${nanoid()}`);
 });
 
+Before({ tags: "@organisation" }, () => {
+  setOrganisationId(`Org-${nanoid()}`);
+});
 After({ tags: "@dictionary" }, () => {
   isLoggedIn().then(loggedIn => {
     if (loggedIn) {
@@ -58,3 +64,11 @@ After({ tags: "@dictionary" }, () => {
     }
   });
 });
+After({ tags: "@organisation" }, () => {
+  isLoggedIn().then(loggedIn => {
+    if (loggedIn) {
+      const organisationId = getOrganisationId();
+      cy.deleteOrganisation(organisationId, true);
+    }
+  });
+});

cypress/support/step_definitions/organisation/edit/edit.ts

@@ -0,0 +1,43 @@
+import { Given, Then, When } from "cypress-cucumber-preprocessor/steps";
+import { getOrganisationId } from "../../../utils";
+
+Given(/a (public|private) organization exists/, type => {
+  const organisationId = getOrganisationId();
+  cy.createOrganisation(organisationId, type === "public");
+});
+
+Given("the user is on the edit organization page", () =>
+  cy.visit(`/orgs/${getOrganisationId()}/edit/`)
+);
+
+When(/the user selects "(.+)" Public Access/, public_access => {
+  switch (public_access) {
+    case "View":
+      cy.get("#public_access").type("{uparrow}{uparrow}{enter}");
+      break;
+    case "None":
+      cy.get("#public_access").type("{downarrow}{downarrow}{enter}");
+      break;
+    default:
+      throw `Unknown Public Access ${public_access}. I only know how to handle "View" and "None".`;
+  }
+});
+
+When("the user submits the form", () => {
+  cy.get("form").submit();
+  cy.url().should("not.contain", `/edit/`);
+});
+
+Then("the organization should not be publicly visible", () =>
+  cy
+    .getOrganisation(getOrganisationId())
+    .its("public_access")
+    .should("eq", "None")
+);
+
+Then("the organization should be publicly visible", () =>
+  cy
+    .getOrganisation(getOrganisationId())
+    .its("public_access")
+    .should("eq", "View")
+);