diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2017-01-26 19:16:50 +0100 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2017-02-06 11:49:30 +0100 |
| commit | 5d3816652e13cde6bf5e9de814d2c9d1e6593601 (patch) | |
| tree | f6137cb0baeb01330a1729d00c059988ced600ee /spec/lib/gitlab/workhorse_spec.rb | |
| parent | 572fb0be9b1d45437b7c0ed1000399657f471ec7 (diff) | |
| download | gitlab-ce-5d3816652e13cde6bf5e9de814d2c9d1e6593601.tar.gz | |
Introduce maximum session time for terminal websocket connectionterminal-max-session-time
Store the value in application settings.
Expose the value to Workhorse.
Diffstat (limited to 'spec/lib/gitlab/workhorse_spec.rb')
| -rw-r--r-- | spec/lib/gitlab/workhorse_spec.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb index 7dd4d76d1a3..a32c6131030 100644 --- a/spec/lib/gitlab/workhorse_spec.rb +++ b/spec/lib/gitlab/workhorse_spec.rb @@ -42,7 +42,8 @@ describe Gitlab::Workhorse, lib: true do out = { subprotocols: ['foo'], url: 'wss://example.com/terminal.ws', - headers: { 'Authorization' => ['Token x'] } + headers: { 'Authorization' => ['Token x'] }, + max_session_time: 600 } out[:ca_pem] = ca_pem if ca_pem out @@ -53,7 +54,8 @@ describe Gitlab::Workhorse, lib: true do 'Terminal' => { 'Subprotocols' => ['foo'], 'Url' => 'wss://example.com/terminal.ws', - 'Header' => { 'Authorization' => ['Token x'] } + 'Header' => { 'Authorization' => ['Token x'] }, + 'MaxSessionTime' => 600 } } out['Terminal']['CAPem'] = ca_pem if ca_pem |