fix tests

Author: RobertJoonas

test/plausible_web/controllers/api/stats_controller/authorization_test.exs

@@ -24,9 +24,14 @@ defmodule PlausibleWeb.Api.StatsController.AuthorizationTest do
     test "returns stats for public site", %{conn: conn} do
       conn = init_session(conn)
       site = insert(:site, public: true)
-      conn = get(conn, "/api/stats/#{site.domain}/main-graph")
 
-      assert %{"plot" => _any} = json_response(conn, 200)
+      conn =
+        post(conn, "/api/stats/#{site.domain}/query", %{
+          "date_range" => "day",
+          "metrics" => ["visitors"]
+        })
+
+      assert %{"results" => _} = json_response(conn, 200)
     end
   end
 
@@ -185,16 +190,26 @@ defmodule PlausibleWeb.Api.StatsController.AuthorizationTest do
 
     test "returns stats for public site", %{conn: conn} do
       site = new_site(public: true)
-      conn = get(conn, "/api/stats/#{site.domain}/main-graph")
 
-      assert %{"plot" => _any} = json_response(conn, 200)
+      conn =
+        post(conn, "/api/stats/#{site.domain}/query", %{
+          "date_range" => "day",
+          "metrics" => ["visitors"]
+        })
+
+      assert %{"results" => _} = json_response(conn, 200)
     end
 
     test "returns stats for a private site that the user owns", %{conn: conn, user: user} do
       site = new_site(public: false, owner: user)
-      conn = get(conn, "/api/stats/#{site.domain}/main-graph")
 
-      assert %{"plot" => _any} = json_response(conn, 200)
+      conn =
+        post(conn, "/api/stats/#{site.domain}/query", %{
+          "date_range" => "day",
+          "metrics" => ["visitors"]
+        })
+
+      assert %{"results" => _} = json_response(conn, 200)
     end
   end
 end

test/plausible_web/controllers/api/stats_controller/debug_metadata_test.exs

@@ -5,10 +5,15 @@ defmodule PlausibleWeb.Api.StatsController.DebugMetadataTest do
   describe "Debug metadata for logged in requests" do
     setup [:create_user, :log_in]
 
-    test "for main-graph", %{conn: conn, user: user} do
+    test "for /api/stats/:domain/query", %{conn: conn, user: user} do
       domain = :rand.bytes(20) |> Base.url_encode64()
       site = new_site(domain: domain, owner: user)
-      conn = get(conn, "/api/stats/#{site.domain}/main-graph")
+
+      conn =
+        post(conn, "/api/stats/#{site.domain}/query", %{
+          "date_range" => "day",
+          "metrics" => ["visitors"]
+        })
 
       assert json_response(conn, 200)
 
@@ -24,11 +29,16 @@ defmodule PlausibleWeb.Api.StatsController.DebugMetadataTest do
         decoded = Jason.decode!(unparsed_log_comment)
 
         assert_matches ^strict_map(%{
-                         "params" => ^strict_map(%{"domain" => ^site.domain}),
-                         "phoenix_action" => "main_graph",
+                         "params" =>
+                           ^strict_map(%{
+                             "domain" => ^site.domain,
+                             "date_range" => "day",
+                             "metrics" => ["visitors"]
+                           }),
+                         "phoenix_action" => "query",
                          "phoenix_controller" => "Elixir.PlausibleWeb.Api.StatsController",
-                         "request_method" => "GET",
-                         "request_path" => ^"/api/stats/#{site.domain}/main-graph",
+                         "request_method" => "POST",
+                         "request_path" => ^"/api/stats/#{site.domain}/query",
                          "site_domain" => ^site.domain,
                          "site_id" => ^site.id,
                          "team_id" => ^team_of(user).id,

test/plausible_web/controllers/api/stats_controller/imported_test.exs

@@ -73,18 +73,24 @@ defmodule PlausibleWeb.Api.StatsController.ImportedTest do
           "imported_visitors"
         )
 
-        conn =
-          get(
-            conn,
-            "/api/stats/#{site.domain}/main-graph?period=month&date=2021-01-01&with_imported=true"
-          )
+        params = %{
+          "date_range" => "month",
+          "metrics" => ["visitors"],
+          "relative_date" => "2021-01-01",
+          "dimensions" => ["time:day"],
+          "include" => %{"imports" => true, "time_labels" => true}
+        }
 
-        assert %{"plot" => plot} = json_response(conn, 200)
+        conn = post(conn, "/api/stats/#{site.domain}/query", params)
 
-        assert Enum.count(plot) == 31
-        assert List.first(plot) == 2
-        assert List.last(plot) == 2
-        assert Enum.sum(plot) == 4
+        response = json_response(conn, 200)
+
+        assert length(response["meta"]["time_labels"]) == 31
+
+        assert response["results"] == [
+                 %{"dimensions" => ["2021-01-01"], "metrics" => [2]},
+                 %{"dimensions" => ["2021-01-31"], "metrics" => [2]}
+               ]
       end
 
       test "returns data grouped by week", %{conn: conn, site: site, import_id: import_id} do
@@ -121,18 +127,24 @@ defmodule PlausibleWeb.Api.StatsController.ImportedTest do
           "imported_visitors"
         )
 
-        conn =
-          get(
-            conn,
-            "/api/stats/#{site.domain}/main-graph?period=month&date=2021-01-01&with_imported=true&interval=week"
-          )
+        params = %{
+          "date_range" => "month",
+          "metrics" => ["visitors"],
+          "relative_date" => "2021-01-01",
+          "dimensions" => ["time:week"],
+          "include" => %{"imports" => true, "time_labels" => true}
+        }
 
-        assert %{"plot" => plot} = json_response(conn, 200)
+        conn = post(conn, "/api/stats/#{site.domain}/query", params)
 
-        assert Enum.count(plot) == 5
-        assert List.first(plot) == 2
-        assert List.last(plot) == 2
-        assert Enum.sum(plot) == 4
+        response = json_response(conn, 200)
+
+        assert length(response["meta"]["time_labels"]) == 5
+
+        assert response["results"] == [
+                 %{"dimensions" => ["2021-01-01"], "metrics" => [2]},
+                 %{"dimensions" => ["2021-01-25"], "metrics" => [2]}
+               ]
       end
 
       test "Sources are imported", %{conn: conn, site: site, import_id: import_id} do