From 382c67f685c8bbf6d9447cda4a9054d633db04d6 Mon Sep 17 00:00:00 2001 From: Kevin Mach Date: Wed, 27 May 2015 18:22:01 -0700 Subject: [PATCH] got rid of merge conflicts --- StoriesAndAcceptanceTests.tex | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/StoriesAndAcceptanceTests.tex b/StoriesAndAcceptanceTests.tex index a70cc3d..67499d5 100644 --- a/StoriesAndAcceptanceTests.tex +++ b/StoriesAndAcceptanceTests.tex @@ -130,14 +130,10 @@ the dropdown or sidebar.} screen. The user can press the "c" key on their keyboard to bring up the input box. \item The user shall write the content of his flashcard in the input box that pops up from the bottom of the screen and blanks the appropriate blanks. -\item The user shall press Enter or clicks on 'Submit' to submit the flashcard to -======= - screen. +\item The user shall press Enter or clicks on 'Submit' to submit the flashcard to screen. \item The user shall write ``Hi I am a card'', and highlight ``card'' and press Ctrl+B or click on 'Blank Selected Text' to mark it as a blank. -\item The user shall presse Enter or clicks on 'Submit' to submit the flashcard to ->>>>>>> 37d7dd0a524dc096e9f0e528c3b8aeec155e2704 - the feed. +\item The user shall presse Enter or clicks on 'Submit' to submit the flashcard to the feed. \end{enumerate} \item [Expected Result:]{The user shall see a flashcard with the text ``Hi I am a card'' with the word ``card'' underlined added to the feed} @@ -148,8 +144,7 @@ the dropdown or sidebar.} \item [Description:]{As a user, I want to add a card from the feed to my deck.} \item [Steps:] \begin{enumerate} -\item The user shall go to the live feed of the class he wants to pull the flashcard - from. +\item The user shall go to the live feed of the class he wants to pull the flashcard from. \item The user shall click on the flashcard that he wants to add to his deck. \end{enumerate} \item [Expected Result:]{The flashcard the user clicked on is added to his deck} @@ -159,8 +154,10 @@ the dropdown or sidebar.} \subsection{User Logs Out Acceptance Test} \begin{description}[style=multiline,leftmargin=5cm] \item [Description:] {As a user, I want to log out of my account.} +\item [Steps:] \begin{enumerate} -\item [Steps:] {The user shall click on the logout button at the top right corner.} +\item [Description:] +{The user shall click on the logout button at the top right corner.} \end{enumerate} \item [Expected Result:] {The user is logged out and is redirected to the login page.} -- 1.9.1