From 309cc26ded4fd30f970c58d9c9f7d88b327f7c18 Mon Sep 17 00:00:00 2001
From: codl <codl@codl.fr>
Date: Wed, 29 Nov 2017 21:42:20 +0100
Subject: add another user to the test setup

---
 tests/setup_app.sql | 103 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 75 insertions(+), 28 deletions(-)

(limited to 'tests/setup_app.sql')

diff --git a/tests/setup_app.sql b/tests/setup_app.sql
index 6239eb3..81f1e18 100644
--- a/tests/setup_app.sql
+++ b/tests/setup_app.sql
@@ -1,37 +1,84 @@
-WITH new_app AS (
-    INSERT INTO oauth_applications (
-            name,
-            uid,
-            secret,
-            redirect_uri,
-            scopes,
-            owner_type,
-            owner_id,
-            created_at,
-            updated_at
-        ) VALUES (
-            'Mastodon.py test suite',
-            '__MASTODON_PY_TEST_ID',
-            '__MASTODON_PY_TEST_SECRET',
-            'urn:ietf:wg:oauth:2.0:oob',
-            'read write follow',
-            'User',
-            1,
-            now(),
-            now()
-        )
-    RETURNING id
-)
+DELETE FROM oauth_access_tokens WHERE id = 6543210987654321;
+DELETE FROM oauth_access_tokens WHERE id = 1234567890123456;
+DELETE FROM oauth_applications WHERE id = 1234567890123456;
+DELETE FROM users WHERE id = 1234567890123456;
+DELETE FROM accounts WHERE id = 1234567890123456;
+
+INSERT INTO accounts (
+    id,
+    username,
+    created_at,
+    updated_at
+) VALUES (
+    1234567890123456,
+    'mastodonpy_test',
+    now(),
+    now()
+);
+
+INSERT INTO users (
+    id,
+    email,
+    account_id,
+    created_at,
+    updated_at,
+    confirmed_at,
+    locale
+) VALUES (
+    1234567890123456,
+    'mastodonpy_test@localhost:3000',
+    1234567890123456,
+    now(),
+    now(),
+    now(),
+    'ja'  -- japanese locale for unicode testing :p
+);
+
+
+
+INSERT INTO oauth_applications (
+    id,
+    name,
+    uid,
+    secret,
+    redirect_uri,
+    scopes,
+    owner_type,
+    owner_id,
+    created_at,
+    updated_at
+) VALUES (
+    1234567890123456,
+    'Mastodon.py test suite',
+    '__MASTODON_PY_TEST_CLIENT_ID',
+    '__MASTODON_PY_TEST_CLIENT_SECRET',
+    'urn:ietf:wg:oauth:2.0:oob',
+    'read write follow',
+    'User',
+    1234567890123456,
+    now(),
+    now()
+);
+
 INSERT INTO oauth_access_tokens (
+    id,
     token,
     scopes,
     application_id,
     resource_owner_id,
     created_at
-) SELECT
-    '__MASTODON_PY_TEST_TOKEN',
+) VALUES (
+    1234567890123456,
+    '__MASTODON_PY_TEST_ACCESS_TOKEN',
+    'read write follow',
+    1234567890123456,
+    1234567890123456,
+    now()
+), (
+    6543210987654321,
+    '__MASTODON_PY_TEST_ACCESS_TOKEN_2',
     'read write follow',
-    new_app.id,
+    1234567890123456,
     1,
     now()
-FROM new_app;
+);
-- 
cgit v1.2.3


From 7d51c0b17efe21f552f5d7f47b276810f9aa0280 Mon Sep 17 00:00:00 2001
From: codl <codl@codl.fr>
Date: Wed, 29 Nov 2017 23:06:28 +0100
Subject: update test docs

---
 tests/setup_app.sql | 84 -----------------------------------------------------
 1 file changed, 84 deletions(-)
 delete mode 100644 tests/setup_app.sql

(limited to 'tests/setup_app.sql')

diff --git a/tests/setup_app.sql b/tests/setup_app.sql
deleted file mode 100644
index 81f1e18..0000000
--- a/tests/setup_app.sql
+++ /dev/null
@@ -1,84 +0,0 @@
-DELETE FROM oauth_access_tokens WHERE id = 6543210987654321;
-DELETE FROM oauth_access_tokens WHERE id = 1234567890123456;
-DELETE FROM oauth_applications WHERE id = 1234567890123456;
-DELETE FROM users WHERE id = 1234567890123456;
-DELETE FROM accounts WHERE id = 1234567890123456;
-
-INSERT INTO accounts (
-    id,
-    username,
-    created_at,
-    updated_at
-) VALUES (
-    1234567890123456,
-    'mastodonpy_test',
-    now(),
-    now()
-);
-
-INSERT INTO users (
-    id,
-    email,
-    account_id,
-    created_at,
-    updated_at,
-    confirmed_at,
-    locale
-) VALUES (
-    1234567890123456,
-    'mastodonpy_test@localhost:3000',
-    1234567890123456,
-    now(),
-    now(),
-    now(),
-    'ja'  -- japanese locale for unicode testing :p
-);
-
-
-
-INSERT INTO oauth_applications (
-    id,
-    name,
-    uid,
-    secret,
-    redirect_uri,
-    scopes,
-    owner_type,
-    owner_id,
-    created_at,
-    updated_at
-) VALUES (
-    1234567890123456,
-    'Mastodon.py test suite',
-    '__MASTODON_PY_TEST_CLIENT_ID',
-    '__MASTODON_PY_TEST_CLIENT_SECRET',
-    'urn:ietf:wg:oauth:2.0:oob',
-    'read write follow',
-    'User',
-    1234567890123456,
-    now(),
-    now()
-);
-
-INSERT INTO oauth_access_tokens (
-    id,
-    token,
-    scopes,
-    application_id,
-    resource_owner_id,
-    created_at
-) VALUES (
-    1234567890123456,
-    '__MASTODON_PY_TEST_ACCESS_TOKEN',
-    'read write follow',
-    1234567890123456,
-    1234567890123456,
-    now()
-), (
-    6543210987654321,
-    '__MASTODON_PY_TEST_ACCESS_TOKEN_2',
-    'read write follow',
-    1234567890123456,
-    1,
-    now()
-);
-- 
cgit v1.2.3

