diff --git a/Makefile b/Makefile index 1ea13074..5ab94d22 100644 --- a/Makefile +++ b/Makefile @@ -26,5 +26,10 @@ docker-down-dev: docker-coverage-report: docker-compose exec -i backend bash -c "coverage run manage.py test; coverage report" +docker-run-tests: + docker-compose exec -i backend bash -c "python manage.py test" + +docker-run-tests-no-i: + docker-compose exec backend bash -c "python manage.py test" docker-coverage-report-no-i: docker-compose exec backend bash -c "coverage run manage.py test; coverage report" diff --git a/brightIDfaucet/urls.py b/brightIDfaucet/urls.py index e4cd13dc..43ebe04a 100644 --- a/brightIDfaucet/urls.py +++ b/brightIDfaucet/urls.py @@ -14,7 +14,7 @@ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -from django.urls import path, include +from django.urls import include, path from faucet.views import artwork_view @@ -25,7 +25,7 @@ urlpatterns = [ path("admin/", admin.site.urls), path("pass/art//", artwork_view), - path("api/v1/", include("faucet.urls")), + path("api/gastap/", include("faucet.urls")), path("api/auth/", include("authentication.urls")), path("api/tokentap/", include("tokenTap.urls")), path("api/prizetap/", include("prizetap.urls")), diff --git a/faucet/urls.py b/faucet/urls.py index ee488a5d..775e7718 100644 --- a/faucet/urls.py +++ b/faucet/urls.py @@ -41,7 +41,7 @@ path("user/last-claim/", LastClaimView.as_view(), name="last-claim"), path("user/claims/", ListClaims.as_view(), name="claims"), path("claims/count/", ClaimCountView.as_view(), name="claims-count"), - path("chain/list/", ChainListView.as_view(), name="chain-list"), # can have auth token for more user specific info + path("chain/list/", ChainListView.as_view(), name="chain-list"), path("chain/small-list/", SmallChainListView.as_view(), name="small-chain-list"), path( "chain//claim-max/",