edited test files to merge

Author: jjcapparell

lesson_03/quiz/quiz.yaml

@@ -9,8 +9,7 @@ quiz:
     jamescapparell:
       - $2y$10$iLvL/AaFPzcGZrcna7umMuHqkZe1f9at/ix77NUI6uakDGNuVKQCy
       - $2y$10$FLxmGXJLm5EziyhA5D33ju0kUjXhiDbuUdImciLQz8lBRu5ou0hee
-<<<<<<< HEAD
-      - $2y$10$9bIwC0Or.LhwAZrNL5Dvn.vjyhDF79Iw5ukm3h/oKauRCYOGSIlSK
+      - $2y$10$hQTJ1d2giJ40AI8rSgBqWOij7j3WVqsvAMYOLFiixbYTcvETuF5cC
     oyeyemijimoh:
       - $2y$10$2LlSxAEM1HmR3Wl2fO6LQueu/77spr5SuWAh4b3MKesIWNy3CFjGe
       - $2y$10$csA90DFxK7.uq6dSfS06Yukk5fQPrzLvU2Lp43ArTs2za28LVvRGO
@@ -23,7 +22,3 @@ quiz:
       - $2y$10$XcsVuO66KZiUiN75NtssdOkKvHKhuBo91JgE/TJEnSrrzbhjxuql.
       - $2y$10$9fZs867NHxoPQ/VWMeLyj.us5Kg3SLPcbt9O5ki/FdJ37TbhgFMFC
       - $2y$10$GfjcKvtzr6n8553Mdr1RJOOYDfzOudlW.3i8otsH0HiW52CU7tUAW
-
-=======
-      - $2y$10$hQTJ1d2giJ40AI8rSgBqWOij7j3WVqsvAMYOLFiixbYTcvETuF5cC
->>>>>>> c159d83 (edited yaml file)

lesson_03/quiz/src/quizzes/james_capparell_quiz.ts

@@ -28,7 +28,7 @@ export class JamesCapparellQuiz implements QuizQuestionProvider {
         [AnswerChoice.C, 'New Castle County'],
         [AnswerChoice.D, 'Lancaster County'],
       ]),
-      AnswerChoice.C,
+      AnswerChoice.UNANSWERED,
     ); // Replace `UNANSWERED` with the correct answer.
   }
   private static makeQuestion1(): QuizQuestion {
@@ -41,15 +41,15 @@ export class JamesCapparellQuiz implements QuizQuestionProvider {
         [AnswerChoice.C, 'Mega Man'],
         [AnswerChoice.D, 'Pikachu'],
       ]),
-      AnswerChoice.A,
+      AnswerChoice.UNANSWERED,
     ); // Replace `UNANSWERED` with the correct answer.
   }
 
   private static makeQuestion2(): QuizQuestion {
     return new QuizQuestion(
       2,
       'Type the full answer while filling in the blanks! A _____ that transforms ____ data into ____ data using automatically executed, pre-programmed ____.',
-      'A computer is a machine that transforms input data to output data using automatically executed, pre-programmed instructions.',
+      'A _____ that transforms ____ data into ____ data using automatically executed, pre-programmed ____.',
     ); // Provide an answer.
   }
 }

lesson_03/quiz/src/quizzes/quizzes.module.ts

@@ -1,20 +1,18 @@
 import { Module } from '@nestjs/common';
 import { AnotherQuiz } from './another_quiz.js';
-import { OyeyemiJimohQuiz } from './oyeyemi_jimoh_quiz.js';
 import { AnthonyMaysQuiz } from './anthony_mays_quiz.js';
 import { JamesCapparellQuiz } from './james_capparell_quiz.js';
 import { JosephCaballeroQuiz } from './joseph_caballero_quiz.js';
+import { OyeyemiJimohQuiz } from './oyeyemi_jimoh_quiz.js';
 import { YafiahAbdullahQuiz } from './yafiah_abdullah_quiz.js';
 
-
 export const Quizzes = Symbol.for('Quizzes');
 
 // Add your quiz provider here.
-const QUIZ_PROVIDERS = [AnthonyMaysQuiz, AnotherQuiz, JamesCapparellQuiz];
-
 const QUIZ_PROVIDERS = [
   AnthonyMaysQuiz,
   YafiahAbdullahQuiz,
+  JamesCapparellQuiz,
   AnotherQuiz,
   JosephCaballeroQuiz,
   OyeyemiJimohQuiz,