Fix testing for plugins (#1277)

* Move plugins tests back into normal test workflow

* change when tests run

* make tests slightly more readable in PR

.github/workflows/testing.yaml

@@ -1,6 +1,7 @@
 name: Testing
 
 on:
+  workflow_dispatch:
   push:
     branches: [ develop, release ]
     paths:
@@ -10,7 +11,6 @@ on:
     - 'poetry.lock'
     - 'pyproject.toml'
   pull_request:
-    branches: [ develop ]
     paths:
     - 'jrnl/**'
     - 'features/**'
@@ -29,6 +29,7 @@ jobs:
       matrix:
         python-version: [ 3.7, 3.8, 3.9, 3.10-dev ]
         os: [ ubuntu-latest, macos-latest, windows-latest ]
+        has_plugins: [ 'no plugins', 'plugins' ]
 
     steps:
     - run: git config --global core.autocrlf false
@@ -74,6 +75,12 @@ jobs:
 
         echo 'DEPS_INSTALLED=true' >> $GITHUB_ENV
 
+      # this is temporary until we implement a 'given' step
+      # to conditionally install plugins during bdd tests
+    - name: Install plugins
+      if: ${{ matrix.has_plugins == 'plugins' }}
+      run: poetry run pip install tests/external_plugins_src
+
     - name: Code formatting (Black)
       if: ${{ matrix.python-version != '3.10-dev' && env.DEPS_INSTALLED == 'true' }}
       run: |

.github/workflows/testing_external_plugins.yaml

@@ -1,57 +0,0 @@
-name: Testing
-
-on:
-  push:
-    branches: [ develop, release ]
-    paths:
-    - 'jrnl/**'
-    - 'features/**'
-    - 'tests/**'
-    - 'poetry.lock'
-    - 'pyproject.toml'
-  pull_request:
-    branches: [ develop ]
-    paths:
-    - 'jrnl/**'
-    - 'features/**'
-    - 'tests/**'
-    - 'poetry.lock'
-    - 'pyproject.toml'
-
-jobs:
-  test-namespace-plugins:
-    if: >
-      ! contains(github.event.head_commit.message, '[ci skip]')
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        python-version: [ 3.7, 3.8, 3.9 ]
-        os: [ ubuntu-latest, macos-latest, windows-latest ]
-        exclude: # Added for GitHub Actions PR problem 2020-12-19 -- remove later!
-          - os: windows-latest
-            python-version: 3.9
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Install dependencies
-      run: |
-        python -m pip install pip setuptools wheel --upgrade
-        python -m pip install .
-        python -m pip install ./tests/external_plugins_src/
-        python -m pip install pytest behave
-    # installed test plugins aren't recognized by "behave" if run from the
-    # project's root folder
-
-    - name: Test with pytest
-      if: success() || failure()
-      run: pytest --junitxml=reports/pytest/results.xml
-
-    - name: Test with behave
-      if: success() || failure()
-      run: cd features && behave --no-skipped --format progress2 --junit --junit-directory ../reports/behave