diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ef784de..5d13bde 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,6 @@ on: jobs: - test: environment: test runs-on: ubuntu-latest @@ -29,3 +28,22 @@ jobs: CLIENT_ID: ${{ secrets.CLIENT_ID }} CLIENT_SECRET: ${{ secrets.CLIENT_SECRET }} run: make test + + build_and_publish: + needs: test + if: github.ref == 'refs/heads/main' && success() + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Log in to Docker Hub + env: + DOCKER_USERNAME: ${{ secrets.DOCKER_REGISTRY_USER }} + DOCKER_PASSWORD: ${{ secrets.DOCKER_REGISTRY_PWD }} + DOCKER_REGISTRY_HOST: ${{ secrets.DOCKER_REGISTRY_HOST }} + run: echo "${DOCKER_PASSWORD}" | docker login "${DOCKER_REGISTRY_HOST}" -u "${DOCKER_USERNAME}" --password-stdin + + - name: Build and push Docker image + run: make docker_push \ No newline at end of file diff --git a/services/api/controllers/group/invite_code_test.go b/services/api/controllers/group/invite_code_test.go index e2a812a..fa5aceb 100644 --- a/services/api/controllers/group/invite_code_test.go +++ b/services/api/controllers/group/invite_code_test.go @@ -6,25 +6,9 @@ import ( "time" ) -func TestIndexToChar(t *testing.T) { - assert.Equal(t, byte('0'), indexToChar(0), "Expected '0' for index 0") - assert.Equal(t, byte('1'), indexToChar(1), "Expected '1' for index 1") - assert.Equal(t, byte('2'), indexToChar(2), "Expected '2' for index 2") - assert.Equal(t, byte('8'), indexToChar(8), "Expected '8' for index 8") - assert.Equal(t, byte('a'), indexToChar(10), "Expected 'a' for index 10") - assert.Equal(t, byte('b'), indexToChar(11), "Expected 'b' for index 11") - assert.Equal(t, byte('z'), indexToChar(35), "Expected 'z' for index 35") - assert.Equal(t, byte('A'), indexToChar(36), "Expected 'A' for index 36") - assert.Equal(t, byte('B'), indexToChar(37), "Expected 'B' for index 37") - assert.Equal(t, byte('Z'), indexToChar(61), "Expected 'Z' for index 61") -} - func TestGenerateInviteCodeUniqueness(t *testing.T) { inviteCode := generateInviteCode() assert.Len(t, inviteCode, inviteCodeLength, "Expected invite code to be 6 characters long") - for _, char := range inviteCode { - assert.True(t, char >= '0' && char <= '9' || char >= 'a' && char <= 'z' || char >= 'A' && char <= 'Z', "Expected invite code to contain only alphanumeric characters") - } time.Sleep(time.Millisecond) inviteCode2 := generateInviteCode() assert.NotEqual(t, inviteCode, inviteCode2, "Expected two different invite codes")