diff options
author | Rémy Coutable <remy@rymai.me> | 2016-12-16 12:44:41 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-12-16 12:44:41 +0000 |
commit | 9c9d23151174fbbcf0b40bd1a223b9b7b60d1342 (patch) | |
tree | 46197df82330c756c0cb3f39f842c0f46a864712 | |
parent | 67f41ac0e172fba99f62075f2c8113fd4bb71ac8 (diff) | |
parent | 8feba01708f10d0ea6f9bb4d49b4cbf05b47ab9b (diff) | |
download | gitlab-ce-9c9d23151174fbbcf0b40bd1a223b9b7b60d1342.tar.gz |
Merge branch 'fix-21-specs' into 'master'
Fix specs in Ruby 2.1
Ruby 2.1 requires a basename argument to `Tempfile.open`, so just call
it something that makes sense in context for the spec.
See merge request !8138
-rw-r--r-- | spec/lib/gitlab/middleware/multipart_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/gitlab/middleware/multipart_spec.rb b/spec/lib/gitlab/middleware/multipart_spec.rb index c79c6494576..ab1ab22795c 100644 --- a/spec/lib/gitlab/middleware/multipart_spec.rb +++ b/spec/lib/gitlab/middleware/multipart_spec.rb @@ -7,7 +7,7 @@ describe Gitlab::Middleware::Multipart do let(:middleware) { described_class.new(app) } it 'opens top-level files' do - Tempfile.open do |tempfile| + Tempfile.open('top-level') do |tempfile| env = post_env({ 'file' => tempfile.path }, { 'file.name' => 'filename' }, Gitlab::Workhorse.secret, 'gitlab-workhorse') expect(app).to receive(:call) do |env| @@ -33,7 +33,7 @@ describe Gitlab::Middleware::Multipart do end it 'opens files one level deep' do - Tempfile.open do |tempfile| + Tempfile.open('one-level') do |tempfile| in_params = { 'user' => { 'avatar' => { '.name' => 'filename' } } } env = post_env({ 'user[avatar]' => tempfile.path }, in_params, Gitlab::Workhorse.secret, 'gitlab-workhorse') @@ -48,7 +48,7 @@ describe Gitlab::Middleware::Multipart do end it 'opens files two levels deep' do - Tempfile.open do |tempfile| + Tempfile.open('two-levels') do |tempfile| in_params = { 'project' => { 'milestone' => { 'themesong' => { '.name' => 'filename' } } } } env = post_env({ 'project[milestone][themesong]' => tempfile.path }, in_params, Gitlab::Workhorse.secret, 'gitlab-workhorse') |