From 73e73c84e4e7a8602511569441f8c793439739ac Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michielbdejong@users.noreply.github.com>
Date: Thu, 30 Jun 2022 16:33:24 +0200
Subject: [PATCH] Run CRUD tests v6.0.0 and WAC tests v7.1.0 (#1693)

* Run CRUD tests v6.0.0 and WAC tests v7.0.0

* Get tests to run PR (change to nodeSolidServer later)

* Remove superfluous empty line

* SKIP_CONC

* Correct org name in repo URL

* Use WAC tests v7.1.0
---
 test/surface/docker/server/Dockerfile  | 2 +-
 test/surface/run-solid-test-suite.sh   | 5 ++---
 test/surface/solid-crud-tests-env.list | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/surface/docker/server/Dockerfile b/test/surface/docker/server/Dockerfile
index da4c24609..300739334 100644
--- a/test/surface/docker/server/Dockerfile
+++ b/test/surface/docker/server/Dockerfile
@@ -1,7 +1,7 @@
 FROM node:latest
 ARG BRANCH=main
 RUN echo Testing branch ${BRANCH} of NSS
-RUN git clone https://github.com/solid/node-solid-server
+RUN git clone https://github.com/nodeSolidServer/node-solid-server
 WORKDIR node-solid-server
 RUN git checkout ${BRANCH}
 RUN git status
diff --git a/test/surface/run-solid-test-suite.sh b/test/surface/run-solid-test-suite.sh
index 0936b0f7a..b2cdfd52a 100755
--- a/test/surface/run-solid-test-suite.sh
+++ b/test/surface/run-solid-test-suite.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 set -e
 
-
 function setup {
   echo Branch name: $1
   docker network create testnet
@@ -47,9 +46,9 @@ teardown || true
 setup $1
 waitForNss server
 runTests webid-provider-tests v2.0.3
-runTests solid-crud-tests nss-skips
+runTests solid-crud-tests v6.0.0
 waitForNss thirdparty
-runTests web-access-control-tests v6.0.0
+runTests web-access-control-tests v7.1.0
 teardown
 
 # To debug, e.g. running web-access-control-tests jest interactively,
diff --git a/test/surface/solid-crud-tests-env.list b/test/surface/solid-crud-tests-env.list
index eff72df49..d95843af2 100644
--- a/test/surface/solid-crud-tests-env.list
+++ b/test/surface/solid-crud-tests-env.list
@@ -2,3 +2,4 @@ ALICE_WEBID=https://server/profile/card#me
 SERVER_ROOT=https://server
 USERNAME=alice
 PASSWORD=123
+SKIP_CONC=1