test: replace e2e-memory with unit test

Closes #580
ory · Jul 27, 2020 · 52bd839 · 52bd839
1 parent aea1fb8
commit 52bd839
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -133,30 +133,34 @@ workflows:
       - test-e2e:
           name: test-e2e-sqlite
           flavor: sqlite
-          filters:
-            tags:
-              only: /.*/
-      - test-e2e:
-          name: test-e2e-memory
-          flavor: memory
+          requires:
+            - test
+            - nancy/test
+            - gloangci/lint
           filters:
             tags:
               only: /.*/
       - test-e2e:
           name: test-e2e-postgres
           flavor: postgres
+          requires:
+            - test-e2e-postgres
           filters:
             tags:
               only: /.*/
       - test-e2e:
           name: test-e2e-mysql
           flavor: mysql
+          requires:
+            - test-e2e-mysql
           filters:
             tags:
               only: /.*/
       - test-e2e:
           name: test-e2e-cockroach
           flavor: cockroach
+          requires:
+            - test-e2e-cockroach
           filters:
             tags:
               only: /.*/
@@ -170,7 +174,6 @@ workflows:
           requires:
             - test
             - test-e2e-sqlite
-            - test-e2e-memory
             - test-e2e-postgres
             - test-e2e-mysql
             - test-e2e-cockroach
@@ -184,7 +187,6 @@ workflows:
           requires:
             - test
             - test-e2e-sqlite
-            - test-e2e-memory
             - test-e2e-postgres
             - test-e2e-mysql
             - test-e2e-cockroach
@@ -198,7 +200,6 @@ workflows:
           requires:
             - test
             - test-e2e-sqlite
-            - test-e2e-memory
             - test-e2e-postgres
             - test-e2e-mysql
             - test-e2e-cockroach
@@ -214,7 +215,6 @@ workflows:
           requires:
             - test
             - test-e2e-sqlite
-            - test-e2e-memory
             - test-e2e-postgres
             - test-e2e-mysql
             - test-e2e-cockroach
@@ -235,7 +235,6 @@ workflows:
             - goreleaser/test
             - test
             - test-e2e-sqlite
-            - test-e2e-memory
             - test-e2e-postgres
             - test-e2e-mysql
             - test-e2e-cockroach

diff --git a/driver/driver_default_test.go b/driver/driver_default_test.go
@@ -1,10 +1,15 @@
 package driver_test
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/ory/viper"
+	"github.com/ory/x/logrusx"
 
 	driver "github.com/ory/kratos/driver"
 	"github.com/ory/kratos/driver/configuration"
@@ -27,3 +32,12 @@ func TestDriverDefault_SQLiteMemoryMode(t *testing.T) {
 		}
 	})
 }
+
+func TestDriverNew(t *testing.T) {
+	viper.Set("dsn", "memory")
+	d, err := driver.NewDefaultDriver(logrusx.New("", ""),
+		"", "", "", true)
+	require.NoError(t, err)
+	assert.EqualValues(t, configuration.DefaultSQLiteMemoryDSN, d.Configuration().DSN())
+	require.NoError(t, d.Registry().Persister().Ping(context.Background()))
+}
diff --git a/test/e2e/run.sh b/test/e2e/run.sh
@@ -112,7 +112,7 @@ run() {
 
   yq merge test/e2e/profiles/kratos.base.yml "test/e2e/profiles/${profile}/.kratos.yml" > test/e2e/kratos.generated.yml
   ($kratos serve --dev -c test/e2e/kratos.generated.yml > "${base}/test/e2e/kratos.${profile}.e2e.log" 2>&1 &)
-  
+
   npm run wait-on -- -t 10000 http-get://127.0.0.1:4434/health/ready \
     http-get://127.0.0.1:4455/health \
     http-get://127.0.0.1:4445/health/ready \
@@ -189,10 +189,6 @@ case "$1" in
           db="${TEST_DATABASE_SQLITE}"
           ;;
 
-        memory)
-          db="${TEST_DATABASE_MEMORY}"
-          ;;
-
         mysql)
           db="${TEST_DATABASE_MYSQL}"
           ;;