diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-03-01 18:14:53 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-03-01 18:14:53 +0000 |
| commit | 119cdf3b3b56aa3c237b070ffde856f09992a8a1 (patch) | |
| tree | 02e6cd5efb2a7f2f2247da0ca811ef70c54f40a9 /spec/spec_helper.rb | |
| parent | 56e106d47f76c8692bfc2acdd018f5b2d11afd95 (diff) | |
| parent | bb41a889487463f626796a390148ae7870c16824 (diff) | |
| download | gitlab-ce-webpack-registry.tar.gz | |
Merge branch 'master' into 'webpack-registry'webpack-registry
# Conflicts:
# config/webpack.config.js
Diffstat (limited to 'spec/spec_helper.rb')
| -rw-r--r-- | spec/spec_helper.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index c0f3366fb52..9f6f0204a16 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -186,6 +186,10 @@ RSpec.configure do |config| example.run if Gitlab::Database.postgresql? end + config.around(:each, :mysql) do |example| + example.run if Gitlab::Database.mysql? + end + # This makes sure the `ApplicationController#can?` method is stubbed with the # original implementation for all view specs. config.before(:each, type: :view) do |