summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean Molenaar <SMillerDev@users.noreply.github.com>2022-09-28 21:07:44 +0200
committerBenjamin Brahmer <info@b-brahmer.de>2022-10-10 16:03:19 +0200
commit50b78092dc50a1e45f4137f394b546e16878e6b0 (patch)
tree81988be8f9bb8a3ce7d38701120bf7f0c7419a73
parentefc2cc84a9f5ede5a23be44597551b13c62ebaa1 (diff)
feat: start servers from make
Co-authored-by: Sean Molenaar <SMillerDev@users.noreply.github.com> Signed-off-by: Benjamin Brahmer <info@b-brahmer.de>
-rw-r--r--Makefile10
-rw-r--r--docs/developer.md6
2 files changed, 11 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 7e55a1bb3..08b9dc45e 100644
--- a/Makefile
+++ b/Makefile
@@ -222,4 +222,12 @@ test: php-test-dependencies
.PHONY: feed-test
feed-test:
- ./bin/tools/check_feeds.sh \ No newline at end of file
+ ./bin/tools/check_feeds.sh
+
+.PHONY: feed-server
+feed-server:
+ php -S 127.0.0.1:8090 -t $(CURDIR)/tests/test_helper/feeds
+
+.PHONY: nextcloud-server
+nextcloud-server:
+ php -S 127.0.0.1:8080 -t $(CURDIR)/../../. \ No newline at end of file
diff --git a/docs/developer.md b/docs/developer.md
index 6dda72852..50f82db1d 100644
--- a/docs/developer.md
+++ b/docs/developer.md
@@ -41,15 +41,13 @@ You also need to pull the submodules of the news repo.
git submodules update --init
```
-The cli tests expect that the feeds are reachable at `http://localhost:8090`, to achieve that you can use the [builtin php server](https://www.php.net/manual/en/features.commandline.webserver.php).
-
-Change into the `tests/test_helpers/feeds` directory and execute `php -S localhost:8090` you can also run it in the background like this `php -S localhost:8090 &`.
+The cli tests expect that the feeds are reachable at `http://localhost:8090`, to achieve that you can use `make feed-server &` the `&` means it'll run in the background.
Now the test feeds will be reachable for bats.
Run the tests by executing `bats tests/command` you can also only run specific tests for example `bats tests/command/feeds.bats`.
For the API tests you need to run a second php server or have another web server that provides Nextcloud and the News App.
The tests expect to find Nextcloud at `http://localhost:8080`
-You can do this by running `php -S localhost:8080` in the Nextcloud server repository.
+You can do this by running `make nextcloud-server`.
The bats tests can be executed like this `bats tests/api`.