diff options
| author | Simponic <elizabeth.hunt@simponic.xyz> | 2023-01-28 23:04:49 -0700 |
|---|---|---|
| committer | Simponic <elizabeth.hunt@simponic.xyz> | 2023-01-29 00:15:25 -0700 |
| commit | ecd07b0c9b81cfa1cf09abae8caacc04af20e911 (patch) | |
| tree | 3af3491a2df279375a0aaf46b77d0c507c92b3c6 | |
| parent | 593a631a564926b5b118805b8bea13a753e4757d (diff) | |
| download | chessh-ecd07b0c9b81cfa1cf09abae8caacc04af20e911.tar.gz chessh-ecd07b0c9b81cfa1cf09abae8caacc04af20e911.zip | |
Set ssh port in test config, move asciinema-player to reg deps
| -rw-r--r-- | config/test.exs | 2 | ||||
| -rwxr-xr-x | deploy.sh | 4 | ||||
| -rw-r--r-- | front/package.json | 6 | ||||
| -rw-r--r-- | test/ssh/ssh_auth_test.exs | 6 |
4 files changed, 8 insertions, 10 deletions
diff --git a/config/test.exs b/config/test.exs index 60b42be..ae8c230 100644 --- a/config/test.exs +++ b/config/test.exs @@ -19,5 +19,5 @@ config :hammer, ] config :chessh, - port: 34_355, + ssh_port: 34_355, key_dir: Path.join(Path.dirname(__DIR__), "priv/test_keys") @@ -42,7 +42,7 @@ docker run \ --env-file $env_file \ --network $project_name \ --name $project_name-server \ - --publish "${host}:${host_ssh_port}:${container_ssh_port}/tcp" \ + --publish "${HOST}:${SSH_PORT}:${SSH_PORT}/tcp" \ --net-alias server \ chessh/server @@ -52,6 +52,6 @@ docker run \ --env-file $env_file \ --network $project_name \ --name $project_name-frontend \ - --publish "${HOST}:${PORT}:80/tcp" \ + --publish "${HOST}:${WEB_PORT}:80/tcp" \ --net-alias frontend \ chessh/frontend diff --git a/front/package.json b/front/package.json index f7d9d5d..5f42aea 100644 --- a/front/package.json +++ b/front/package.json @@ -13,7 +13,8 @@ "react-modal": "^3.16.1", "react-router-dom": "^6.6.2", "react-scripts": "5.0.1", - "web-vitals": "^2.1.4" + "web-vitals": "^2.1.4", + "asciinema-player": "^3.0.1" }, "scripts": { "start": "react-scripts start", @@ -38,8 +39,5 @@ "last 1 firefox version", "last 1 safari version" ] - }, - "devDependencies": { - "asciinema-player": "^3.0.1" } } diff --git a/test/ssh/ssh_auth_test.exs b/test/ssh/ssh_auth_test.exs index 54b0069..70a57be 100644 --- a/test/ssh/ssh_auth_test.exs +++ b/test/ssh/ssh_auth_test.exs @@ -38,7 +38,7 @@ defmodule Chessh.SSH.AuthTest do send( parent, {:attempted, - :ssh.connect(@localhost, Application.fetch_env!(:chessh, :port), + :ssh.connect(@localhost, Application.fetch_env!(:chessh, :ssh_port), user: String.to_charlist(@valid_user.username), password: String.to_charlist(@valid_user.password), auth_methods: auth_method, @@ -90,7 +90,7 @@ defmodule Chessh.SSH.AuthTest do Task.Supervisor.start_child(sup, fn -> {:ok, conn} = - :ssh.connect(@localhost, Application.fetch_env!(:chessh, :port), + :ssh.connect(@localhost, Application.fetch_env!(:chessh, :ssh_port), user: String.to_charlist(@valid_user.username), password: String.to_charlist(@valid_user.password), auth_methods: 'password', @@ -105,7 +105,7 @@ defmodule Chessh.SSH.AuthTest do Task.Supervisor.start_child(sup, fn -> {:ok, conn} = - :ssh.connect(@localhost, Application.fetch_env!(:chessh, :port), + :ssh.connect(@localhost, Application.fetch_env!(:chessh, :ssh_port), user: String.to_charlist(@valid_user.username), auth_methods: 'publickey', silently_accept_hosts: true, |