Commit 382c67f685c8bbf6d9447cda4a9054d633db04d6
1 parent
d8e1b7f698
Exists in
master
got rid of merge conflicts
Showing 1 changed file with 6 additions and 9 deletions Side-by-side Diff
StoriesAndAcceptanceTests.tex
View file @
382c67f
| ... | ... | @@ -130,14 +130,10 @@ |
| 130 | 130 | screen. The user can press the "c" key on their keyboard to bring up the input box. |
| 131 | 131 | \item The user shall write the content of his flashcard in the input box that pops up |
| 132 | 132 | from the bottom of the screen and blanks the appropriate blanks. |
| 133 | -\item The user shall press Enter or clicks on 'Submit' to submit the flashcard to | |
| 134 | -======= | |
| 135 | - screen. | |
| 133 | +\item The user shall press Enter or clicks on 'Submit' to submit the flashcard to screen. | |
| 136 | 134 | \item The user shall write ``Hi I am a card'', and highlight ``card'' and press |
| 137 | 135 | Ctrl+B or click on 'Blank Selected Text' to mark it as a blank. |
| 138 | -\item The user shall presse Enter or clicks on 'Submit' to submit the flashcard to | |
| 139 | ->>>>>>> 37d7dd0a524dc096e9f0e528c3b8aeec155e2704 | |
| 140 | - the feed. | |
| 136 | +\item The user shall presse Enter or clicks on 'Submit' to submit the flashcard to the feed. | |
| 141 | 137 | \end{enumerate} |
| 142 | 138 | \item [Expected Result:]{The user shall see a flashcard with the text ``Hi I am |
| 143 | 139 | a card'' with the word ``card'' underlined added to the feed} |
| ... | ... | @@ -148,8 +144,7 @@ |
| 148 | 144 | \item [Description:]{As a user, I want to add a card from the feed to my deck.} |
| 149 | 145 | \item [Steps:] |
| 150 | 146 | \begin{enumerate} |
| 151 | -\item The user shall go to the live feed of the class he wants to pull the flashcard | |
| 152 | - from. | |
| 147 | +\item The user shall go to the live feed of the class he wants to pull the flashcard from. | |
| 153 | 148 | \item The user shall click on the flashcard that he wants to add to his deck. |
| 154 | 149 | \end{enumerate} |
| 155 | 150 | \item [Expected Result:]{The flashcard the user clicked on is added to his deck} |
| 156 | 151 | |
| ... | ... | @@ -159,8 +154,10 @@ |
| 159 | 154 | \subsection{User Logs Out Acceptance Test} |
| 160 | 155 | \begin{description}[style=multiline,leftmargin=5cm] |
| 161 | 156 | \item [Description:] {As a user, I want to log out of my account.} |
| 157 | +\item [Steps:] | |
| 162 | 158 | \begin{enumerate} |
| 163 | -\item [Steps:] {The user shall click on the logout button at the top right corner.} | |
| 159 | +\item [Description:] | |
| 160 | +{The user shall click on the logout button at the top right corner.} | |
| 164 | 161 | \end{enumerate} |
| 165 | 162 | \item [Expected Result:] {The user is logged out and is redirected to the login page.} |
| 166 | 163 |