fixes

Author: segoon

CMakeLists.txt

@@ -63,8 +63,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_NAME}_objs)
 
 
 # Functional Tests
-include(UserverTestsuite)
-
 userver_testsuite_add_simple()
 
 

Makefile

@@ -1,5 +1,5 @@
 CMAKE_COMMON_FLAGS ?= -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
-CMAKE_DEBUG_FLAGS ?= -DUSERVER_SANITIZE='addr ub'
+CMAKE_DEBUG_FLAGS ?= -DUSERVER_SANITIZE=''
 CMAKE_RELEASE_FLAGS ?=
 NPROCS ?= $(shell nproc)
 CLANG_FORMAT ?= clang-format
@@ -34,9 +34,8 @@ build-debug build-release: build-%: build_%/CMakeCache.txt
 # Test
 .PHONY: test-debug test-release
 test-debug test-release: test-%: build-%
-	cmake --build build_$* -j $(NPROCS) --target upastebin_unittest
-	cmake --build build_$* -j $(NPROCS) --target upastebin_benchmark
-	cd build_$* && ((test -t 1 && GTEST_COLOR=1 PYTEST_ADDOPTS="--color=yes" ctest -V) || ctest -V)
+	cmake --build build_$* -j $(NPROCS) --target runtests-upastebin
+	cd build_$* && GTEST_COLOR=1 PYTEST_ADDOPTS="--color=yes" ctest -V
 	pycodestyle tests
 
 # Start the service (via testsuite service runner)

src/store.cpp

@@ -2,6 +2,7 @@
 
 #include <userver/components/component_context.hpp>
 #include <userver/formats/json/inline.hpp>
+#include <userver/storages/postgres/io/chrono.hpp>
 #include <userver/http/common_headers.hpp>
 #include <userver/server/handlers/exceptions.hpp>
 #include <userver/server/handlers/http_handler_base.hpp>
@@ -25,7 +26,7 @@ std::string StoreHandler::HandleRequestThrow(
   auto author = request.GetArg("author");
   auto ip_source = request.GetRemoteAddress().PrimaryAddressString();
   auto text = request.RequestBody();
-  auto created_at = userver::utils::datetime::Now();
+  userver::storages::postgres::TimePointTz created_at{userver::utils::datetime::Now()};
 
   pg_->Execute(userver::storages::postgres::ClusterHostType::kMaster,
                "INSERT INTO upastebin.texts (uuid, author, ip_source, text, created_at) VALUES "

tests/test_crud.py

@@ -31,6 +31,14 @@ async def test_create_and_retrieve(service_client):
 
     response = await service_client.get('/api/v1/latest')
     assert response.status == 200
-    assert response.json() == {
-        'items': [{'author': 'foo', 'ip': '::ffff:127.0.0.1', 'text': TEXT}],
+    json = response.json()
+    assert json == {
+        'items': [
+            {
+                'author': 'foo',
+                'ip': '::ffff:127.0.0.1',
+                'id': uuid,
+                'text': TEXT,
+            }
+        ],
     }

www-data/index.js

@@ -26,7 +26,7 @@ function onSend() {
 		return response.json();
 	})
 	.then(function(json) {
-		alert(json);
+		document.location = '../' + json['uuid'];
 	})
 	.catch(function (error) {
 		alert(error);

www-data/text.js

@@ -16,7 +16,9 @@ function setup_text() {
       return response.text();
     })
     .then(function (text) {
-      document.getElementById("text").innerHTML = text; // TODO: escape
+      const p = document.createElement("div");
+      p.appendChild(document.createTextNode(text));
+      document.getElementById("text").innerHTML = p.innerHTML;
     })
     .catch(function (error) {
       alert(error);