wip

alphagov · Dec 6, 2024 · 9b59d3b · 9b59d3b
1 parent 0f6c158
commit 9b59d3b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/...ager/app/controllers/content_block_manager/content_block/documents/schedule_controller.rb b/...ager/app/controllers/content_block_manager/content_block/documents/schedule_controller.rb
@@ -9,6 +9,6 @@ def edit
   def update
     document = ContentBlockManager::ContentBlock::Document.find(params[:document_id])
     @content_block_edition = document.latest_edition
-    schedule_or_publish("content_block_manager/content_block/documents/schedule/edit")
+    schedule_or_publish
   end
 end
diff --git a/...nager/app/controllers/content_block_manager/content_block/editions/workflow_controller.rb b/...nager/app/controllers/content_block_manager/content_block/editions/workflow_controller.rb
@@ -88,7 +88,7 @@ def review_update
     end
 
     @schedule_publishing = params[:schedule_publishing]
-    @scheduled_at = scheduled_publication_params
+    @scheduled_at = scheduled_publication_params.to_h
 
     render :review_update
   rescue ActiveRecord::RecordInvalid

diff --git a/lib/engines/content_block_manager/features/schedule_object.feature b/lib/engines/content_block_manager/features/schedule_object.feature
@@ -25,13 +25,13 @@ Feature: Schedule a content object
     When I am updating a content block
     Then I am asked when I want to publish the change
     And I schedule the change for 7 days in the future
+    Then I am asked to review my answers
+    And I confirm my answers are correct
+    And I click confirm
     When I click to view the content block
     And I click to edit the schedule
     And I choose to publish the change now
     And I save and continue
-    Then I am asked to review my answers
-    And I confirm my answers are correct
-    When I click confirm
     When I click to view the content block
     Then the published state of the object should be shown
     And there should be no jobs scheduled
@@ -41,12 +41,12 @@ Feature: Schedule a content object
     When I am updating a content block
     Then I am asked when I want to publish the change
     And I schedule the change for 7 days in the future
+    Then I am asked to review my answers
+    And I confirm my answers are correct
+    And I click confirm
     When I click to view the content block
     And I click to edit the schedule
     And I schedule the change for 5 days in the future
-    Then I am asked to review my answers
-    And I confirm my answers are correct
-    When I click confirm
     When I click to view the content block
     Then I should see the scheduled date on the object
     And there should only be one job scheduled
@@ -62,6 +62,9 @@ Feature: Schedule a content object
     When I am updating a content block
     And I choose to publish the change now
     And I save and continue
+    Then I am asked to review my answers
+    And I confirm my answers are correct
+    When I click confirm
     Then there should be no jobs scheduled
 
   @disable-sidekiq-test-mode
@@ -75,9 +78,6 @@ Feature: Schedule a content object
     When I click to view the content block
     And I click to edit the schedule
     And I schedule the change for 5 days in the future
-    Then I am asked to review my answers
-    And I confirm my answers are correct
-    When I click confirm
     When I click to view the content block
     Then there should only be one job scheduled