EASY-2273: Improve submit state description (#179)

DANS-KNAW · Sep 5, 2019 · 44bb1a5 · 44bb1a5
1 parent bf6be1a
commit 44bb1a5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/main/scala/nl.knaw.dans.easy.deposit/Submitter.scala b/src/main/scala/nl.knaw.dans.easy.deposit/Submitter.scala
@@ -95,7 +95,7 @@ class Submitter(stagingBaseDir: File,
       // EASY-1464 3.3.8.a create empty staged bag to take a copy of the deposit
       stageBag <- DansV0Bag.empty(stagedDir / bagDirName).map(_.withCreated())
       // EASY-1464 3.3.6 change state and copy with the rest of the deposit properties to staged dir
-      _ <- stateManager.changeState(StateInfo(State.submitted, "Deposit is ready for processing."))
+      _ <- stateManager.changeState(StateInfo(State.submitted, "The deposit is being processed"))
       submittedId <- stateManager.getSubmittedBagId // created by changeState
       submitDir = submitToBaseDir / submittedId.toString
       _ = if (submitDir.exists) throw AlreadySubmittedException(draftDeposit.id)

diff --git a/src/test/scala/nl.knaw.dans.easy.deposit/StateManagerSpec.scala b/src/test/scala/nl.knaw.dans.easy.deposit/StateManagerSpec.scala
@@ -57,7 +57,7 @@ class StateManagerSpec extends TestSupportFixture {
     // the problem will be logged
     draftPropsFile.writeText(
       s"""state.label = SUBMITTED
-         |state.description = The dataset is ready for processing
+         |state.description = The deposit is being processed
       """.stripMargin)
     StateManager(draftDeposit, submitBase, easyHome).getStateInfo shouldBe Success(StateInfo(
       State.submitted,
@@ -69,7 +69,7 @@ class StateManagerSpec extends TestSupportFixture {
     // the problem will be logged
     draftPropsFile.writeText(
       s"""state.label = SUBMITTED
-         |state.description = The dataset is ready for processing
+         |state.description = The deposit is being processed
          |bag-store.bag-id = $submittedUuid
       """.stripMargin)
     StateManager(draftDeposit, submitBase, easyHome).getStateInfo shouldBe Success(StateInfo(
@@ -81,7 +81,7 @@ class StateManagerSpec extends TestSupportFixture {
   it should "change SUBMITTED to IN_PROGRESS" in {
     draftPropsFile.writeText(
       s"""state.label = SUBMITTED
-         |state.description = The deposit is ready for processing
+         |state.description = The deposit is being processed
          |bag-store.bag-id = $submittedUuid
       """.stripMargin)
     submittedPropsFile.writeText(
@@ -97,7 +97,7 @@ class StateManagerSpec extends TestSupportFixture {
   it should "return the fedora landing page" in {
     draftPropsFile.writeText(
       s"""state.label = SUBMITTED
-         |state.description = The deposit is ready for processing
+         |state.description = The deposit is being processed
          |bag-store.bag-id = $submittedUuid
          |identifier.doi = 10.5072/dans-zyf-v9sc
       """.stripMargin)
@@ -116,7 +116,7 @@ class StateManagerSpec extends TestSupportFixture {
   it should "mail the draft uuid" in {
     draftPropsFile.writeText(
       s"""state.label = SUBMITTED
-         |state.description = The deposit is ready for processing
+         |state.description = The deposit is being processed
       """.stripMargin)
     submittedPropsFile.writeText(
       s"""state.label = REJECTED
@@ -135,7 +135,7 @@ class StateManagerSpec extends TestSupportFixture {
   it should "mail the submitted uuid" in {
     draftPropsFile.writeText(
       s"""state.label = SUBMITTED
-         |state.description = The deposit is ready for processing
+         |state.description = The deposit is being processed
          |bag-store.bag-id = $submittedUuid
       """.stripMargin)
     submittedPropsFile.writeText(
@@ -162,7 +162,7 @@ class StateManagerSpec extends TestSupportFixture {
   it should "return the curators message" in {
     draftPropsFile.writeText(
       s"""state.label = SUBMITTED
-         |state.description = The deposit is ready for processing
+         |state.description = The deposit is being processed
          |bag-store.bag-id = $submittedUuid
       """.stripMargin)
     submittedPropsFile.writeText(
@@ -176,7 +176,7 @@ class StateManagerSpec extends TestSupportFixture {
   it should "return a generic landing page when no fedora-id is available" in {
     draftPropsFile.writeText(
       s"""state.label = SUBMITTED
-         |state.description = The deposit is ready for processin
+         |state.description = The deposit is being processed
          |bag-store.bag-id = $submittedUuid
          |identifier.doi = 10.5072/dans-zyf-v9sc
       """.stripMargin)

diff --git a/src/test/scala/nl.knaw.dans.easy.deposit/servlets/IntegrationSpec.scala b/src/test/scala/nl.knaw.dans.easy.deposit/servlets/IntegrationSpec.scala
@@ -236,7 +236,7 @@ class IntegrationSpec extends TestSupportFixture with ServletFixture with Scalat
     get(
       uri = s"/deposit/$uuid/state", headers = Seq(fooBarBasicAuthHeader),
     ) {
-      body shouldBe """{"state":"SUBMITTED","stateDescription":"Deposit is ready for processing."}"""
+      body shouldBe """{"state":"SUBMITTED","stateDescription":"The deposit is being processed"}"""
       status shouldBe OK_200
     }
   }