Merge pull request #1339 from bjones1/test-fix

Test fix

Author: bnmnetp

.github/workflows/python-package.yml

@@ -27,22 +27,21 @@ jobs:
                   channel: "#builds"
               if: always()
 
-            - name: Setup npm and build runestone.js
+            - name: Install npm dependencies
               run: |
                   npm install
             - name: Set up Python ${{ matrix.python-version }}
               uses: actions/setup-python@v2
               with:
                   python-version: ${{ matrix.python-version }}
-            - name: Install dependencies
+            - name: Install Python dependencies
               run: |
-                  python -m pip install --upgrade pip
-                  # Install Poetry per the `instructions <https://python-poetry.org/docs/#osx--linux--bashonwindows-install-instructions>`.
-                  curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | python -
-                  $HOME/.poetry/bin/poetry install
+                  # Install Poetry per the `instructions <https://python-poetry.org/docs/master/#installing-with-the-official-installer>`.
+                  curl -sSL https://install.python-poetry.org | python3 -
+                  $HOME/.local/bin/poetry install
             - name: Tests
               run: |
-                $HOME/.poetry/bin/poetry run pytest
+                $HOME/.local/bin/poetry run pytest
 
             - uses: act10ns/slack@v1
               with:

runestone/conftest.py

@@ -122,7 +122,7 @@ def setUpModule(self):
         os.chdir(self.base_path)
         # Compile the docs. Save the stdout and stderr for examination.
         p = subprocess.run(
-            ["runestone", "build", "--all"], capture_output=True, text=True,
+            [sys.executable, "-m", "runestone", "build", "--all"], capture_output=True, text=True,
         )
         self.build_stdout_data = p.stdout
         self.build_stderr_data = p.stderr
@@ -184,9 +184,9 @@ def setUpModule(self):
                         "Unknown error while trying to kill stale runestone server"
                     )
 
-        # Run the server. Simply calling ``runestone serve`` fails, since the process killed isn't the actual server, but probably a setuptools-created launcher.
+        # Run the server. Simply calling ``runestone preview`` fails, since the process killed isn't the actual server, but probably a setuptools-created launcher.
         self.runestone_server = subprocess.Popen(
-            [sys.executable, "-m", "runestone", "serve", "--port", PORT]
+            [sys.executable, "-m", "runestone", "preview", "--port", PORT]
         )
 
         # Testing time in dominated by browser startup/shutdown. So, simply run all tests in a module in a single browser instance to speed things up. See ``RunestoneTestCase.setUp`` for additional code to (mostly) clear the browser between tests.

runestone/hparsons/test/test_hparsons.py

@@ -51,7 +51,7 @@ def test_run_block(selenium_utils_get):
     # 1-2. Click on run button to check the result is hinting missing blocks
     run_btn.click()
     feedback_area = hp_question.find_element(By.CLASS_NAME, 'alert')
-    assert 'Your program is too short.' in feedback_area.text
+    assert 'Your answer is too short.' in feedback_area.text
 
     # 2-1. Click on more blocks to form an incorrect solution
     block = drag_area.find_element(By.CSS_SELECTOR, '.parsons-block')
@@ -60,7 +60,7 @@ def test_run_block(selenium_utils_get):
     run_btn.click()
     time.sleep(1)
     feedback_area = hp_question.find_element(By.CLASS_NAME, 'alert')
-    assert 'Highlighted blocks in your program are wrong or are in the wrong order.' in feedback_area.text
+    assert 'Highlighted blocks in your answer are wrong or are in the wrong order.' in feedback_area.text
     highlighted_blocks = []
     for block in drop_area.find_elements(By.CSS_SELECTOR, '.parsons-block.incorrectPosition'):
         highlighted_blocks.append(block.text)