Merge branch 'master' into master

.github/workflows/R-CMD-check.yaml → .github/workflows/R-CMD-check.yaml.archive

@@ -1,3 +1,7 @@
+# The CI testing functionality in PsyNet no longer works as the shinytest
+# package is no longer under development. It needs to be upgraded to use
+# shinytest2. In the meantime we are disabling this CI test.
+
 # Workflow derived from https://github.com/r-lib/actions/tree/master/examples
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on: [push, pull_request]
@@ -11,17 +15,23 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
-      - uses: r-lib/actions/setup-r@v1
+      - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
 
-      - uses: r-lib/actions/setup-r-dependencies@v1
+      - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: rcmdcheck
+          extra-packages: any::rcmdcheck
+          needs: check
+
+      - name: Install shinytest dependencies
+        shell: Rscript {0}
+        run: |
+          if (!shinytest::dependenciesInstalled()) shinytest::installDependencies()
 
-      - uses: r-lib/actions/check-r-package@v1
+      - uses: r-lib/actions/check-r-package@v2
 
       - name: Show testthat output
         if: always()

NEWS.md

@@ -1,6 +1,8 @@
+* Fixed Latvian dictionary.
+
 # mdt 2.8.1
 
-* Fixed Latvian dictionary.
+* Switched to HTTPS for loading stimuli.
 
 # mdt 2.8.0
 

R/mdt.R

@@ -73,7 +73,7 @@ mdt <- function(num_items = 20L,
                 take_training = TRUE,
                 label = "MDT",
                 feedback = mdt.feedback.no_score(),
-                media_dir = "http://media.gold-msi.org/test_materials/MDT/v4",
+                media_dir = "https://media.gold-msi.org/test_materials/MDT/v4",
                 next_item.criterion = "bOpt",
                 next_item.estimator = "BM",
                 next_item.prior_dist = "norm",

README.md

@@ -1,13 +1,20 @@
 # Melodic Discrimination Test (MDT) 
 
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1300950.svg)](https://doi.org/10.5281/zenodo.1300950)
-[![R-CMD-check](https://github.com/pmcharrison/mdt/workflows/R-CMD-check/badge.svg)](https://github.com/pmcharrison/mdt/actions)
 
 The MDT is an adaptive test of the ability to discriminate melodies.
 
-We invite you to try the test [here](http://shiny.pmcharrison.com/mdt-demo) and
+We invite you to try the test [here](https://shiny.gold-msi.org/longgold_demo/) and
 to read the paper [here](https://doi.org/10.1038/s41598-017-03586-z).
 
+Want to use this test in your own online study, but don't want to go to the trouble of setting up your own 
+web server? You are invited to host your study on the DOTS testing server of the 
+[German Society for Music Psychology (DGM)](https://en.musikpsychologie.de/index.html).
+This service is free of charge, but requires a current membership of the GDM, which currently
+costs 45 euros per year (22 euros for students and the unemployed).
+For more information please contact Klaus Frieler ([email protected]).
+
+
 ## Citation
 
 When using the MDT in your own research, you can cite the original MDT research paper:
@@ -60,6 +67,23 @@ into new languages:
 
 `devtools::install_github('pmcharrison/mdt')`
 
+5. Tell Shiny to use your computer's default browser, instead of the RStudio browser,
+   which doensn't play well with this test.
+   First, open your .Rprofile file:
+
+```r
+install.packages("usethis")
+usethis::edit_r_profile()
+```
+
+   Add the following lines:
+
+```r
+options(shiny.launch.browser = .rs.invokeShinyWindowExternal)
+```
+
+  Save the file, then restart your R session (in the RStudio toolbar, click Session then Restart R).
+
 ## Usage
 
 ### Quick demo