From daed7ea58f2e664cdf70b4c80e7023adcfdd4f8e Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 4 Sep 2024 12:51:31 +0600
Subject: [PATCH 01/11] Add general class to hide any element

---
 assets/css/frontend.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/assets/css/frontend.scss b/assets/css/frontend.scss
index 98ffe11fa8..ebbf1dd22b 100644
--- a/assets/css/frontend.scss
+++ b/assets/css/frontend.scss
@@ -403,6 +403,10 @@ a.sensei-certificate-link {
 	}
 }
 
+.sensei-item-no-display {
+	display: none;
+}
+
 /**
  * Quiz Pagination
  */

From 8313e89c7fbffde734f794d93e768f90b6f24139 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 4 Sep 2024 12:52:27 +0600
Subject: [PATCH 02/11] Render the quiz complete button in hidded state when
 applicable

---
 templates/single-quiz/pagination.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/single-quiz/pagination.php b/templates/single-quiz/pagination.php
index d1c67f81fd..ce7c6d8e99 100644
--- a/templates/single-quiz/pagination.php
+++ b/templates/single-quiz/pagination.php
@@ -90,8 +90,9 @@ class="wp-block-button__link button sensei-stop-double-submission sensei-quiz-pa
 						<?php echo esc_attr( _n( 'Next Question', 'Next Questions', $sensei_next_question_count, 'sensei-lms' ) ); ?>
 					</button>
 				</div>
-			<?php elseif ( $sensei_is_quiz_available && ! $sensei_is_quiz_completed ) : ?>
-				<div class="sensei-quiz-action wp-block-button">
+			<?php endif ?>
+			<?php if ( $sensei_is_quiz_available && ! $sensei_is_quiz_completed ) : ?>
+				<div class="sensei-quiz-action wp-block-button <?php echo esc_attr( $sensei_question_loop['current_page'] < $sensei_question_loop['total_pages'] ? 'sensei-item-no-display' : '' ); ?>">
 					<button
 						type="submit"
 						name="quiz_complete"

From 12d818875b573b5db1e12063ec3f75a9c698a051 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 4 Sep 2024 12:52:56 +0600
Subject: [PATCH 03/11] Add test that button renders with "complete" action
 only when applicable

---
 .../course-theme/test-class-quiz-actions.php  | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php

diff --git a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
new file mode 100644
index 0000000000..43c29ee117
--- /dev/null
+++ b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * Class Quiz_Actions_Test
+ *
+ * @package Sensei
+ */
+class Quiz_Actions_Test extends WP_UnitTestCase {
+
+	use Sensei_Course_Enrolment_Test_Helpers;
+	use Sensei_Course_Enrolment_Manual_Test_Helpers;
+
+	/**
+	 * @var $factory
+	 */
+	protected $factory;
+
+	/**
+	 * Constructor function.
+	 */
+	public function __construct() {
+		parent::__construct();
+	}
+
+	public function setUp(): void {
+		parent::setUp();
+
+		$this->factory = new Sensei_Factory();
+
+		self::resetEnrolmentProviders();
+	}
+
+	public function tearDown(): void {
+		parent::tearDown();
+		$this->factory->tearDown();
+
+		// Remove all lessons.
+		$lessons = get_posts( 'post_type=lesson' );
+		foreach ( $lessons as $index => $lesson ) {
+			wp_delete_post( $lesson->ID, true );
+		}
+
+		// Remove all quizzes.
+		$quizzes = get_posts( 'post_type=quiz' );
+		foreach ( $quizzes as $index => $quiz ) {
+			wp_delete_post( $quiz->ID, true );
+		}
+		WP_Block_Supports::$block_to_render = null;
+
+		self::resetEnrolmentProviders();
+	}
+
+	public function testRender_WhenPaginationIsShown_AlwaysRendersQuizCompleteButton() {
+		/* Arrange */
+		global $post, $sensei_question_loop;
+
+		$this->addEnrolmentProvider( Sensei_Test_Enrolment_Provider_Always_Provides::class );
+		$this->prepareEnrolmentManager();
+
+		$user_id = $this->factory->user->create();
+		wp_set_current_user( $user_id );
+
+		$course_id = $this->factory->course->create();
+		$lesson_id = $this->factory->lesson->create(
+			[
+				'meta_input' => [
+					'_lesson_course' => $course_id,
+				],
+			]
+		);
+		$quiz_id   = $this->factory->maybe_create_quiz_for_lesson( $lesson_id );
+		$post      = get_post( $quiz_id );
+
+		$this->factory->question->create_many( 10, [ 'quiz_id' => $quiz_id ] );
+
+		$course_enrolment = Sensei_Course_Enrolment::get_course_instance( $course_id );
+		$course_enrolment->enrol( $user_id );
+
+		update_post_meta(
+			$quiz_id,
+			'_pagination',
+			wp_json_encode( [ 'pagination_number' => 2 ] )
+		);
+
+		$this->go_to( get_permalink( $quiz_id ) );
+
+		WP_Block_Supports::$block_to_render = [
+			'attrs'     => [],
+			'blockName' => 'sensei-lms/quiz-actions',
+		];
+
+		Sensei_Quiz::start_quiz_questions_loop();
+
+		/* Act */
+		$result_for_other_pages = ( new \Sensei\Blocks\Course_Theme\Quiz_Actions() )->render();
+		$sensei_question_loop['current_page'] = $sensei_question_loop['total_pages'];
+		$result_for_last_page = ( new \Sensei\Blocks\Course_Theme\Quiz_Actions() )->render();
+
+		/* Assert */
+		$this->assertStringContainsString( 'sensei-item-no-display', $result_for_other_pages );
+		$this->assertStringNotContainsString( 'sensei-item-no-display', $result_for_last_page );
+	}
+}

From ca79f147d4a655086517a48d919bb1eb6453c139 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 4 Sep 2024 13:19:12 +0600
Subject: [PATCH 04/11] Add changelog

---
 changelog/fix-timed-quiz-input-not-stopping-when-time-ends | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelog/fix-timed-quiz-input-not-stopping-when-time-ends

diff --git a/changelog/fix-timed-quiz-input-not-stopping-when-time-ends b/changelog/fix-timed-quiz-input-not-stopping-when-time-ends
new file mode 100644
index 0000000000..dc84758801
--- /dev/null
+++ b/changelog/fix-timed-quiz-input-not-stopping-when-time-ends
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Timed quiz not stopping when time ends

From 17085784cf2d057a55b11f9723fcf76686ddef58 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 4 Sep 2024 13:30:44 +0600
Subject: [PATCH 05/11] Fix lint issues in test

---
 .../blocks/course-theme/test-class-quiz-actions.php | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
index 43c29ee117..0ba597c3b6 100644
--- a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
+++ b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
@@ -11,17 +11,12 @@ class Quiz_Actions_Test extends WP_UnitTestCase {
 	use Sensei_Course_Enrolment_Manual_Test_Helpers;
 
 	/**
+	 * Sensei factory instance.
+	 *
 	 * @var $factory
 	 */
 	protected $factory;
 
-	/**
-	 * Constructor function.
-	 */
-	public function __construct() {
-		parent::__construct();
-	}
-
 	public function setUp(): void {
 		parent::setUp();
 
@@ -92,9 +87,9 @@ public function testRender_WhenPaginationIsShown_AlwaysRendersQuizCompleteButton
 		Sensei_Quiz::start_quiz_questions_loop();
 
 		/* Act */
-		$result_for_other_pages = ( new \Sensei\Blocks\Course_Theme\Quiz_Actions() )->render();
+		$result_for_other_pages               = ( new \Sensei\Blocks\Course_Theme\Quiz_Actions() )->render();
 		$sensei_question_loop['current_page'] = $sensei_question_loop['total_pages'];
-		$result_for_last_page = ( new \Sensei\Blocks\Course_Theme\Quiz_Actions() )->render();
+		$result_for_last_page                 = ( new \Sensei\Blocks\Course_Theme\Quiz_Actions() )->render();
 
 		/* Assert */
 		$this->assertStringContainsString( 'sensei-item-no-display', $result_for_other_pages );

From b255638bf60557f2ab164431096522eff60eb4b2 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 4 Sep 2024 19:50:36 +0600
Subject: [PATCH 06/11] Update test file comments

---
 includes/class-sensei-lesson.php                  |  6 ++++--
 .../course-theme/test-class-quiz-actions.php      | 15 +++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/includes/class-sensei-lesson.php b/includes/class-sensei-lesson.php
index 3ffaa788f0..f1e1cfa1b5 100755
--- a/includes/class-sensei-lesson.php
+++ b/includes/class-sensei-lesson.php
@@ -5061,6 +5061,8 @@ public static function footer_quiz_call_to_action( $lesson_id = 0, $user_id = 0
 	 * @return bool
 	 */
 	public static function should_show_lesson_actions( int $lesson_id, int $user_id = 0 ): bool {
+		$show_actions = true;
+
 		$user_id = empty( $user_id ) ? get_current_user_id() : $user_id;
 
 		$lesson_prerequisite = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
@@ -5069,12 +5071,12 @@ public static function should_show_lesson_actions( int $lesson_id, int $user_id
 
 			// If the user hasn't completed the prerequisites then hide the current actions.
 			// (If the user is either the lesson creator or admin, show actions).
-			return Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $user_id )
+			$show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $user_id )
 				|| Sensei()->lesson->is_lesson_author( $lesson_id, $user_id )
 				|| current_user_can( 'manage_options' );
 		}
 
-		return true;
+		return apply_filter( 'sensei_should_show_lesson_actions', $show_actions );
 	}
 
 	/**
diff --git a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
index 0ba597c3b6..055d27a89a 100644
--- a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
+++ b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
@@ -1,10 +1,17 @@
 <?php
 
 /**
- * Class Quiz_Actions_Test
+ * This file contains the Quiz_Actions_Test class.
  *
- * @package Sensei
+ * @package sensei
  */
+
+ use Sensei\Blocks\Course_Theme\Quiz_Actions;
+
+ /**
+  * Tests for Quiz_Actions class.
+  * @covers Sensei\Blocks\Course_Theme\Quiz_Actions
+  */
 class Quiz_Actions_Test extends WP_UnitTestCase {
 
 	use Sensei_Course_Enrolment_Test_Helpers;
@@ -87,9 +94,9 @@ public function testRender_WhenPaginationIsShown_AlwaysRendersQuizCompleteButton
 		Sensei_Quiz::start_quiz_questions_loop();
 
 		/* Act */
-		$result_for_other_pages               = ( new \Sensei\Blocks\Course_Theme\Quiz_Actions() )->render();
+		$result_for_other_pages               = ( new Quiz_Actions() )->render();
 		$sensei_question_loop['current_page'] = $sensei_question_loop['total_pages'];
-		$result_for_last_page                 = ( new \Sensei\Blocks\Course_Theme\Quiz_Actions() )->render();
+		$result_for_last_page                 = ( new Quiz_Actions() )->render();
 
 		/* Assert */
 		$this->assertStringContainsString( 'sensei-item-no-display', $result_for_other_pages );

From aeb0008041ced74baeb7365fa74f292418eacf62 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 4 Sep 2024 19:51:06 +0600
Subject: [PATCH 07/11] Revert "Update test file comments"

This reverts commit b255638bf60557f2ab164431096522eff60eb4b2.
---
 includes/class-sensei-lesson.php                  |  6 ++----
 .../course-theme/test-class-quiz-actions.php      | 15 ++++-----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/includes/class-sensei-lesson.php b/includes/class-sensei-lesson.php
index f1e1cfa1b5..3ffaa788f0 100755
--- a/includes/class-sensei-lesson.php
+++ b/includes/class-sensei-lesson.php
@@ -5061,8 +5061,6 @@ public static function footer_quiz_call_to_action( $lesson_id = 0, $user_id = 0
 	 * @return bool
 	 */
 	public static function should_show_lesson_actions( int $lesson_id, int $user_id = 0 ): bool {
-		$show_actions = true;
-
 		$user_id = empty( $user_id ) ? get_current_user_id() : $user_id;
 
 		$lesson_prerequisite = (int) get_post_meta( $lesson_id, '_lesson_prerequisite', true );
@@ -5071,12 +5069,12 @@ public static function should_show_lesson_actions( int $lesson_id, int $user_id
 
 			// If the user hasn't completed the prerequisites then hide the current actions.
 			// (If the user is either the lesson creator or admin, show actions).
-			$show_actions = Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $user_id )
+			return Sensei_Utils::user_completed_lesson( $lesson_prerequisite, $user_id )
 				|| Sensei()->lesson->is_lesson_author( $lesson_id, $user_id )
 				|| current_user_can( 'manage_options' );
 		}
 
-		return apply_filter( 'sensei_should_show_lesson_actions', $show_actions );
+		return true;
 	}
 
 	/**
diff --git a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
index 055d27a89a..0ba597c3b6 100644
--- a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
+++ b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
@@ -1,17 +1,10 @@
 <?php
 
 /**
- * This file contains the Quiz_Actions_Test class.
+ * Class Quiz_Actions_Test
  *
- * @package sensei
+ * @package Sensei
  */
-
- use Sensei\Blocks\Course_Theme\Quiz_Actions;
-
- /**
-  * Tests for Quiz_Actions class.
-  * @covers Sensei\Blocks\Course_Theme\Quiz_Actions
-  */
 class Quiz_Actions_Test extends WP_UnitTestCase {
 
 	use Sensei_Course_Enrolment_Test_Helpers;
@@ -94,9 +87,9 @@ public function testRender_WhenPaginationIsShown_AlwaysRendersQuizCompleteButton
 		Sensei_Quiz::start_quiz_questions_loop();
 
 		/* Act */
-		$result_for_other_pages               = ( new Quiz_Actions() )->render();
+		$result_for_other_pages               = ( new \Sensei\Blocks\Course_Theme\Quiz_Actions() )->render();
 		$sensei_question_loop['current_page'] = $sensei_question_loop['total_pages'];
-		$result_for_last_page                 = ( new Quiz_Actions() )->render();
+		$result_for_last_page                 = ( new \Sensei\Blocks\Course_Theme\Quiz_Actions() )->render();
 
 		/* Assert */
 		$this->assertStringContainsString( 'sensei-item-no-display', $result_for_other_pages );

From a5658e02662c41b14df48b62596ed9de52b3712d Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 4 Sep 2024 19:53:38 +0600
Subject: [PATCH 08/11] Update test file comments

This reverts commit aeb0008041ced74baeb7365fa74f292418eacf62.
---
 .../course-theme/test-class-quiz-actions.php     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
index 0ba597c3b6..6da9035935 100644
--- a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
+++ b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
@@ -1,9 +1,17 @@
 <?php
 
 /**
- * Class Quiz_Actions_Test
+ * This file contains the Quiz_Actions_Test class.
  *
- * @package Sensei
+ * @package sensei
+ */
+
+use Sensei\Blocks\Course_Theme\Quiz_Actions;
+
+/**
+ * Tests for Quiz_Actions class.
+ *
+ * @covers Sensei\Blocks\Course_Theme\Quiz_Actions
  */
 class Quiz_Actions_Test extends WP_UnitTestCase {
 
@@ -87,9 +95,9 @@ public function testRender_WhenPaginationIsShown_AlwaysRendersQuizCompleteButton
 		Sensei_Quiz::start_quiz_questions_loop();
 
 		/* Act */
-		$result_for_other_pages               = ( new \Sensei\Blocks\Course_Theme\Quiz_Actions() )->render();
+		$result_for_other_pages               = ( new Quiz_Actions() )->render();
 		$sensei_question_loop['current_page'] = $sensei_question_loop['total_pages'];
-		$result_for_last_page                 = ( new \Sensei\Blocks\Course_Theme\Quiz_Actions() )->render();
+		$result_for_last_page                 = ( new Quiz_Actions() )->render();
 
 		/* Assert */
 		$this->assertStringContainsString( 'sensei-item-no-display', $result_for_other_pages );

From 7c1a4849ba2f6cb30f4d046697f3ae483c1500df Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 30 Oct 2024 12:33:59 +0600
Subject: [PATCH 09/11] Add quiz style in separate file to hide button

---
 assets/blocks/quiz/style.scss                 |  3 ++
 assets/css/frontend.scss                      |  4 --
 includes/class-sensei-quiz.php                | 22 +++++++++
 templates/single-quiz/pagination.php          |  2 +-
 .../course-theme/test-class-quiz-actions.php  |  4 +-
 tests/unit-tests/test-class-quiz.php          | 45 +++++++++++++++++++
 webpack.config.js                             |  1 +
 7 files changed, 74 insertions(+), 7 deletions(-)
 create mode 100644 assets/blocks/quiz/style.scss

diff --git a/assets/blocks/quiz/style.scss b/assets/blocks/quiz/style.scss
new file mode 100644
index 0000000000..75fb36a177
--- /dev/null
+++ b/assets/blocks/quiz/style.scss
@@ -0,0 +1,3 @@
+.sensei-quiz-action--hidden {
+	display: none;
+}
diff --git a/assets/css/frontend.scss b/assets/css/frontend.scss
index ebbf1dd22b..98ffe11fa8 100644
--- a/assets/css/frontend.scss
+++ b/assets/css/frontend.scss
@@ -403,10 +403,6 @@ a.sensei-certificate-link {
 	}
 }
 
-.sensei-item-no-display {
-	display: none;
-}
-
 /**
  * Quiz Pagination
  */
diff --git a/includes/class-sensei-quiz.php b/includes/class-sensei-quiz.php
index d5a8daf530..85ade1346f 100755
--- a/includes/class-sensei-quiz.php
+++ b/includes/class-sensei-quiz.php
@@ -103,6 +103,28 @@ public function __construct( $file = __FILE__ ) {
 			// Create the quiz progress when the student visits the quiz page for the first time.
 			add_action( 'wp', array( $this, 'maybe_create_quiz_progress' ) );
 		}
+
+		// Enqueue frontend styles.
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
+	}
+
+	/**
+	 * Enqueue frontend CSS files for quizzes.
+	 *
+	 * @internal
+	 *
+	 * @since  $$next-version$$
+	 * @return void
+	 */
+	public function enqueue_styles() {
+		if (
+			is_admin() ||
+			! is_singular( 'quiz' )
+		) {
+			return;
+		}
+
+		Sensei()->assets->enqueue( 'sensei-single-quiz-style', 'blocks/quiz/style.css' );
 	}
 
 	/**
diff --git a/templates/single-quiz/pagination.php b/templates/single-quiz/pagination.php
index ce7c6d8e99..fd8681f774 100644
--- a/templates/single-quiz/pagination.php
+++ b/templates/single-quiz/pagination.php
@@ -92,7 +92,7 @@ class="wp-block-button__link button sensei-stop-double-submission sensei-quiz-pa
 				</div>
 			<?php endif ?>
 			<?php if ( $sensei_is_quiz_available && ! $sensei_is_quiz_completed ) : ?>
-				<div class="sensei-quiz-action wp-block-button <?php echo esc_attr( $sensei_question_loop['current_page'] < $sensei_question_loop['total_pages'] ? 'sensei-item-no-display' : '' ); ?>">
+				<div class="sensei-quiz-action wp-block-button <?php echo esc_attr( $sensei_question_loop['current_page'] < $sensei_question_loop['total_pages'] ? 'sensei-quiz-action--hidden' : '' ); ?>">
 					<button
 						type="submit"
 						name="quiz_complete"
diff --git a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
index 6da9035935..c9206505d6 100644
--- a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
+++ b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
@@ -100,7 +100,7 @@ public function testRender_WhenPaginationIsShown_AlwaysRendersQuizCompleteButton
 		$result_for_last_page                 = ( new Quiz_Actions() )->render();
 
 		/* Assert */
-		$this->assertStringContainsString( 'sensei-item-no-display', $result_for_other_pages );
-		$this->assertStringNotContainsString( 'sensei-item-no-display', $result_for_last_page );
+		$this->assertStringContainsString( 'sensei-quiz-action--hidden', $result_for_other_pages );
+		$this->assertStringNotContainsString( 'sensei-quiz-action--hidden', $result_for_last_page );
 	}
 }
diff --git a/tests/unit-tests/test-class-quiz.php b/tests/unit-tests/test-class-quiz.php
index 0af41f091f..80f73dd1cc 100644
--- a/tests/unit-tests/test-class-quiz.php
+++ b/tests/unit-tests/test-class-quiz.php
@@ -7,6 +7,7 @@
 use Sensei\Internal\Student_Progress\Quiz_Progress\Repositories\Tables_Based_Quiz_Progress_Repository;
 
 class Sensei_Class_Quiz_Test extends WP_UnitTestCase {
+	use Sensei_Test_Login_Helpers;
 
 	use Sensei_Test_Redirect_Helpers;
 
@@ -2539,4 +2540,48 @@ public function testIsQuizAwaitingGradeForUser_IsNotUngraded_ReturnsFalse() {
 		/* Reset */
 		Sensei()->quiz_progress_repository = $quiz_progress_repository;
 	}
+
+	public function testEnqueueStyles_WhenNoPageSet_DoesNotEnqueueStyles() {
+		/* Act */
+		Sensei()->quiz->enqueue_styles();
+
+		/* Assert */
+		$this->assertFalse( wp_style_is( 'sensei-single-quiz-style' ) );
+	}
+
+	public function testEnqueueStyles_WhenOnPagesOtherThanQuiz_DoesNotEnqueueStyles() {
+		/* Arrange */
+		$lesson_id = $this->factory->lesson->create();
+
+		/* Act */
+		$this->go_to( get_permalink( $lesson_id ) );
+		Sensei()->quiz->enqueue_styles();
+
+		/* Assert */
+		$this->assertFalse( wp_style_is( 'sensei-single-quiz-style' ) );
+	}
+
+	public function testConstructor_WhenInAdminScreens_DoesNotHookEnqueueStyles() {
+		/* Arrange */
+		$this->login_as_admin();
+
+		/* Act */
+		set_current_screen( 'edit.php' );
+		Sensei()->quiz->enqueue_styles();
+
+		/* Assert */
+		$this->assertFalse( wp_style_is( 'sensei-single-quiz-style' ) );
+	}
+
+	public function testEnqueueStyles_WhenOnQuizPage_EnqueueStyles() {
+		/* Arrange */
+		$quiz_id = $this->factory->quiz->create();
+
+		/* Act */
+		$this->go_to( get_permalink( $quiz_id ) );
+		Sensei()->quiz->enqueue_styles();
+
+		/* Assert */
+		$this->assertTrue( wp_style_is( 'sensei-single-quiz-style' ) );
+	}
 }
diff --git a/webpack.config.js b/webpack.config.js
index efb65098d6..2b67bb1250 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -82,6 +82,7 @@ const files = [
 	'blocks/quiz/index.js',
 	'blocks/quiz/ordering-promo/index.js',
 	'blocks/quiz/quiz.editor.scss',
+	'blocks/quiz/style.scss',
 	'blocks/shared.js',
 	'blocks/shared-style.scss',
 	'blocks/shared-style-editor.scss',

From 5cf93a3481ce35782020c1a4a5ca0d7c03cad204 Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 30 Oct 2024 12:44:54 +0600
Subject: [PATCH 10/11] Revert "Add quiz style in separate file to hide button"

This reverts commit 7c1a4849ba2f6cb30f4d046697f3ae483c1500df.
---
 assets/blocks/quiz/style.scss                 |  3 --
 assets/css/frontend.scss                      |  4 ++
 includes/class-sensei-quiz.php                | 22 ---------
 templates/single-quiz/pagination.php          |  2 +-
 .../course-theme/test-class-quiz-actions.php  |  4 +-
 tests/unit-tests/test-class-quiz.php          | 45 -------------------
 webpack.config.js                             |  1 -
 7 files changed, 7 insertions(+), 74 deletions(-)
 delete mode 100644 assets/blocks/quiz/style.scss

diff --git a/assets/blocks/quiz/style.scss b/assets/blocks/quiz/style.scss
deleted file mode 100644
index 75fb36a177..0000000000
--- a/assets/blocks/quiz/style.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.sensei-quiz-action--hidden {
-	display: none;
-}
diff --git a/assets/css/frontend.scss b/assets/css/frontend.scss
index 98ffe11fa8..ebbf1dd22b 100644
--- a/assets/css/frontend.scss
+++ b/assets/css/frontend.scss
@@ -403,6 +403,10 @@ a.sensei-certificate-link {
 	}
 }
 
+.sensei-item-no-display {
+	display: none;
+}
+
 /**
  * Quiz Pagination
  */
diff --git a/includes/class-sensei-quiz.php b/includes/class-sensei-quiz.php
index 85ade1346f..d5a8daf530 100755
--- a/includes/class-sensei-quiz.php
+++ b/includes/class-sensei-quiz.php
@@ -103,28 +103,6 @@ public function __construct( $file = __FILE__ ) {
 			// Create the quiz progress when the student visits the quiz page for the first time.
 			add_action( 'wp', array( $this, 'maybe_create_quiz_progress' ) );
 		}
-
-		// Enqueue frontend styles.
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
-	}
-
-	/**
-	 * Enqueue frontend CSS files for quizzes.
-	 *
-	 * @internal
-	 *
-	 * @since  $$next-version$$
-	 * @return void
-	 */
-	public function enqueue_styles() {
-		if (
-			is_admin() ||
-			! is_singular( 'quiz' )
-		) {
-			return;
-		}
-
-		Sensei()->assets->enqueue( 'sensei-single-quiz-style', 'blocks/quiz/style.css' );
 	}
 
 	/**
diff --git a/templates/single-quiz/pagination.php b/templates/single-quiz/pagination.php
index fd8681f774..ce7c6d8e99 100644
--- a/templates/single-quiz/pagination.php
+++ b/templates/single-quiz/pagination.php
@@ -92,7 +92,7 @@ class="wp-block-button__link button sensei-stop-double-submission sensei-quiz-pa
 				</div>
 			<?php endif ?>
 			<?php if ( $sensei_is_quiz_available && ! $sensei_is_quiz_completed ) : ?>
-				<div class="sensei-quiz-action wp-block-button <?php echo esc_attr( $sensei_question_loop['current_page'] < $sensei_question_loop['total_pages'] ? 'sensei-quiz-action--hidden' : '' ); ?>">
+				<div class="sensei-quiz-action wp-block-button <?php echo esc_attr( $sensei_question_loop['current_page'] < $sensei_question_loop['total_pages'] ? 'sensei-item-no-display' : '' ); ?>">
 					<button
 						type="submit"
 						name="quiz_complete"
diff --git a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
index c9206505d6..6da9035935 100644
--- a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
+++ b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
@@ -100,7 +100,7 @@ public function testRender_WhenPaginationIsShown_AlwaysRendersQuizCompleteButton
 		$result_for_last_page                 = ( new Quiz_Actions() )->render();
 
 		/* Assert */
-		$this->assertStringContainsString( 'sensei-quiz-action--hidden', $result_for_other_pages );
-		$this->assertStringNotContainsString( 'sensei-quiz-action--hidden', $result_for_last_page );
+		$this->assertStringContainsString( 'sensei-item-no-display', $result_for_other_pages );
+		$this->assertStringNotContainsString( 'sensei-item-no-display', $result_for_last_page );
 	}
 }
diff --git a/tests/unit-tests/test-class-quiz.php b/tests/unit-tests/test-class-quiz.php
index 80f73dd1cc..0af41f091f 100644
--- a/tests/unit-tests/test-class-quiz.php
+++ b/tests/unit-tests/test-class-quiz.php
@@ -7,7 +7,6 @@
 use Sensei\Internal\Student_Progress\Quiz_Progress\Repositories\Tables_Based_Quiz_Progress_Repository;
 
 class Sensei_Class_Quiz_Test extends WP_UnitTestCase {
-	use Sensei_Test_Login_Helpers;
 
 	use Sensei_Test_Redirect_Helpers;
 
@@ -2540,48 +2539,4 @@ public function testIsQuizAwaitingGradeForUser_IsNotUngraded_ReturnsFalse() {
 		/* Reset */
 		Sensei()->quiz_progress_repository = $quiz_progress_repository;
 	}
-
-	public function testEnqueueStyles_WhenNoPageSet_DoesNotEnqueueStyles() {
-		/* Act */
-		Sensei()->quiz->enqueue_styles();
-
-		/* Assert */
-		$this->assertFalse( wp_style_is( 'sensei-single-quiz-style' ) );
-	}
-
-	public function testEnqueueStyles_WhenOnPagesOtherThanQuiz_DoesNotEnqueueStyles() {
-		/* Arrange */
-		$lesson_id = $this->factory->lesson->create();
-
-		/* Act */
-		$this->go_to( get_permalink( $lesson_id ) );
-		Sensei()->quiz->enqueue_styles();
-
-		/* Assert */
-		$this->assertFalse( wp_style_is( 'sensei-single-quiz-style' ) );
-	}
-
-	public function testConstructor_WhenInAdminScreens_DoesNotHookEnqueueStyles() {
-		/* Arrange */
-		$this->login_as_admin();
-
-		/* Act */
-		set_current_screen( 'edit.php' );
-		Sensei()->quiz->enqueue_styles();
-
-		/* Assert */
-		$this->assertFalse( wp_style_is( 'sensei-single-quiz-style' ) );
-	}
-
-	public function testEnqueueStyles_WhenOnQuizPage_EnqueueStyles() {
-		/* Arrange */
-		$quiz_id = $this->factory->quiz->create();
-
-		/* Act */
-		$this->go_to( get_permalink( $quiz_id ) );
-		Sensei()->quiz->enqueue_styles();
-
-		/* Assert */
-		$this->assertTrue( wp_style_is( 'sensei-single-quiz-style' ) );
-	}
 }
diff --git a/webpack.config.js b/webpack.config.js
index 2b67bb1250..efb65098d6 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -82,7 +82,6 @@ const files = [
 	'blocks/quiz/index.js',
 	'blocks/quiz/ordering-promo/index.js',
 	'blocks/quiz/quiz.editor.scss',
-	'blocks/quiz/style.scss',
 	'blocks/shared.js',
 	'blocks/shared-style.scss',
 	'blocks/shared-style-editor.scss',

From f9207011b9273647ad18fc69c9147685c840a54e Mon Sep 17 00:00:00 2001
From: Imran Hossain <imranh920@gmail.com>
Date: Wed, 30 Oct 2024 12:48:09 +0600
Subject: [PATCH 11/11] Add BEM quiz style in separate file to hide button

This reverts commit 7c1a4849ba2f6cb30f4d046697f3ae483c1500df.
---
 assets/blocks/quiz/style.scss                 |  3 ++
 assets/css/frontend.scss                      |  4 --
 includes/class-sensei-quiz.php                | 22 +++++++++
 templates/single-quiz/pagination.php          |  2 +-
 .../course-theme/test-class-quiz-actions.php  |  4 +-
 tests/unit-tests/test-class-quiz.php          | 46 ++++++++++++++++++-
 webpack.config.js                             |  1 +
 7 files changed, 74 insertions(+), 8 deletions(-)
 create mode 100644 assets/blocks/quiz/style.scss

diff --git a/assets/blocks/quiz/style.scss b/assets/blocks/quiz/style.scss
new file mode 100644
index 0000000000..75fb36a177
--- /dev/null
+++ b/assets/blocks/quiz/style.scss
@@ -0,0 +1,3 @@
+.sensei-quiz-action--hidden {
+	display: none;
+}
diff --git a/assets/css/frontend.scss b/assets/css/frontend.scss
index ebbf1dd22b..98ffe11fa8 100644
--- a/assets/css/frontend.scss
+++ b/assets/css/frontend.scss
@@ -403,10 +403,6 @@ a.sensei-certificate-link {
 	}
 }
 
-.sensei-item-no-display {
-	display: none;
-}
-
 /**
  * Quiz Pagination
  */
diff --git a/includes/class-sensei-quiz.php b/includes/class-sensei-quiz.php
index d5a8daf530..85ade1346f 100755
--- a/includes/class-sensei-quiz.php
+++ b/includes/class-sensei-quiz.php
@@ -103,6 +103,28 @@ public function __construct( $file = __FILE__ ) {
 			// Create the quiz progress when the student visits the quiz page for the first time.
 			add_action( 'wp', array( $this, 'maybe_create_quiz_progress' ) );
 		}
+
+		// Enqueue frontend styles.
+		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_styles' ) );
+	}
+
+	/**
+	 * Enqueue frontend CSS files for quizzes.
+	 *
+	 * @internal
+	 *
+	 * @since  $$next-version$$
+	 * @return void
+	 */
+	public function enqueue_styles() {
+		if (
+			is_admin() ||
+			! is_singular( 'quiz' )
+		) {
+			return;
+		}
+
+		Sensei()->assets->enqueue( 'sensei-single-quiz-style', 'blocks/quiz/style.css' );
 	}
 
 	/**
diff --git a/templates/single-quiz/pagination.php b/templates/single-quiz/pagination.php
index ce7c6d8e99..4784a4e184 100644
--- a/templates/single-quiz/pagination.php
+++ b/templates/single-quiz/pagination.php
@@ -92,7 +92,7 @@ class="wp-block-button__link button sensei-stop-double-submission sensei-quiz-pa
 				</div>
 			<?php endif ?>
 			<?php if ( $sensei_is_quiz_available && ! $sensei_is_quiz_completed ) : ?>
-				<div class="sensei-quiz-action wp-block-button <?php echo esc_attr( $sensei_question_loop['current_page'] < $sensei_question_loop['total_pages'] ? 'sensei-item-no-display' : '' ); ?>">
+				<div class="sensei-quiz-action<?php echo esc_attr( $sensei_question_loop['current_page'] < $sensei_question_loop['total_pages'] ? '--hidden' : '' ); ?> wp-block-button">
 					<button
 						type="submit"
 						name="quiz_complete"
diff --git a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
index 6da9035935..c9206505d6 100644
--- a/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
+++ b/tests/unit-tests/blocks/course-theme/test-class-quiz-actions.php
@@ -100,7 +100,7 @@ public function testRender_WhenPaginationIsShown_AlwaysRendersQuizCompleteButton
 		$result_for_last_page                 = ( new Quiz_Actions() )->render();
 
 		/* Assert */
-		$this->assertStringContainsString( 'sensei-item-no-display', $result_for_other_pages );
-		$this->assertStringNotContainsString( 'sensei-item-no-display', $result_for_last_page );
+		$this->assertStringContainsString( 'sensei-quiz-action--hidden', $result_for_other_pages );
+		$this->assertStringNotContainsString( 'sensei-quiz-action--hidden', $result_for_last_page );
 	}
 }
diff --git a/tests/unit-tests/test-class-quiz.php b/tests/unit-tests/test-class-quiz.php
index 0af41f091f..7f4b8d923a 100644
--- a/tests/unit-tests/test-class-quiz.php
+++ b/tests/unit-tests/test-class-quiz.php
@@ -7,7 +7,7 @@
 use Sensei\Internal\Student_Progress\Quiz_Progress\Repositories\Tables_Based_Quiz_Progress_Repository;
 
 class Sensei_Class_Quiz_Test extends WP_UnitTestCase {
-
+	use Sensei_Test_Login_Helpers;
 	use Sensei_Test_Redirect_Helpers;
 
 	/**
@@ -2539,4 +2539,48 @@ public function testIsQuizAwaitingGradeForUser_IsNotUngraded_ReturnsFalse() {
 		/* Reset */
 		Sensei()->quiz_progress_repository = $quiz_progress_repository;
 	}
+
+	public function testEnqueueStyles_WhenNoPageSet_DoesNotEnqueueStyles() {
+		/* Act */
+		Sensei()->quiz->enqueue_styles();
+
+		/* Assert */
+		$this->assertFalse( wp_style_is( 'sensei-single-quiz-style' ) );
+	}
+
+	public function testEnqueueStyles_WhenOnPagesOtherThanQuiz_DoesNotEnqueueStyles() {
+		/* Arrange */
+		$lesson_id = $this->factory->lesson->create();
+
+		/* Act */
+		$this->go_to( get_permalink( $lesson_id ) );
+		Sensei()->quiz->enqueue_styles();
+
+		/* Assert */
+		$this->assertFalse( wp_style_is( 'sensei-single-quiz-style' ) );
+	}
+
+	public function testConstructor_WhenInAdminScreens_DoesNotHookEnqueueStyles() {
+		/* Arrange */
+		$this->login_as_admin();
+
+		/* Act */
+		set_current_screen( 'edit.php' );
+		Sensei()->quiz->enqueue_styles();
+
+		/* Assert */
+		$this->assertFalse( wp_style_is( 'sensei-single-quiz-style' ) );
+	}
+
+	public function testEnqueueStyles_WhenOnQuizPage_EnqueueStyles() {
+		/* Arrange */
+		$quiz_id = $this->factory->quiz->create();
+
+		/* Act */
+		$this->go_to( get_permalink( $quiz_id ) );
+		Sensei()->quiz->enqueue_styles();
+
+		/* Assert */
+		$this->assertTrue( wp_style_is( 'sensei-single-quiz-style' ) );
+	}
 }
diff --git a/webpack.config.js b/webpack.config.js
index efb65098d6..2b67bb1250 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -82,6 +82,7 @@ const files = [
 	'blocks/quiz/index.js',
 	'blocks/quiz/ordering-promo/index.js',
 	'blocks/quiz/quiz.editor.scss',
+	'blocks/quiz/style.scss',
 	'blocks/shared.js',
 	'blocks/shared-style.scss',
 	'blocks/shared-style-editor.scss',