diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 09:09:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-24 09:09:01 +0300 |
| commit | fa7ac2663b53f61551b9db51f16d55fa4e5b74c3 (patch) | |
| tree | 0cbf33baee16b10803c1d23ec9e0c06e238e43f5 /spec/rack_servers | |
| parent | 4870899d6cec693b58acbef91636e1310160fa28 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/rack_servers')
| -rw-r--r-- | spec/rack_servers/puma_spec.rb | 2 | ||||
| -rw-r--r-- | spec/rack_servers/unicorn_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/rack_servers/puma_spec.rb b/spec/rack_servers/puma_spec.rb index a4b37905af3..80595b267fa 100644 --- a/spec/rack_servers/puma_spec.rb +++ b/spec/rack_servers/puma_spec.rb @@ -5,7 +5,7 @@ require 'spec_helper' require 'fileutils' require 'excon' -describe 'Puma' do +RSpec.describe 'Puma' do before(:all) do project_root = Rails.root.to_s config_lines = File.read(Rails.root.join('config/puma.example.development.rb')) diff --git a/spec/rack_servers/unicorn_spec.rb b/spec/rack_servers/unicorn_spec.rb index 6a02ebcd048..5887b49d269 100644 --- a/spec/rack_servers/unicorn_spec.rb +++ b/spec/rack_servers/unicorn_spec.rb @@ -6,7 +6,7 @@ require 'excon' require 'spec_helper' -describe 'Unicorn' do +RSpec.describe 'Unicorn' do before(:all) do project_root = File.expand_path('../..', __dir__) |