Fix upload tests, reformat code and make rubocop happy

lib/gitlab/lfs/response.rb

@@ -321,7 +321,6 @@ module Gitlab
 
       def download_hypermedia_links(all_objects, existing_objects)
         all_objects.each do |object|
-          # generate links only for existing objects
           if existing_objects.include?(object['oid'])
             object['actions'] = {
               'download' => {
@@ -344,7 +343,7 @@ module Gitlab
 
       def upload_hypermedia_links(all_objects, existing_objects)
         all_objects.each do |object|
-          # generate links only for non-existing objects
+          # generate actions only for non-existing objects
           next if existing_objects.include?(object['oid'])
 
           object['actions'] = {

spec/lib/gitlab/lfs/lfs_router_spec.rb

@@ -248,11 +248,11 @@ describe Gitlab::Lfs::Router do
     describe 'download' do
       describe 'when user is authenticated' do
         before do
-          body = { 'objects' => [{
-                                   'oid' => sample_oid,
+          body = { 'operation' => 'download',
+                   'objects' => [
+                     { 'oid' => sample_oid,
                        'size' => sample_size
-                                 }],
-                   'operation' => 'download'
+                     }]
           }.to_json
           env['rack.input'] = StringIO.new(body)
         end
@@ -274,14 +274,13 @@ describe Gitlab::Lfs::Router do
               expect(response.first).to eq(200)
               response_body = ActiveSupport::JSON.decode(response.last.first)
 
-              expect(response_body).to eq(
-                'objects' => [{
-                    'oid' => sample_oid,
+              expect(response_body).to eq('objects' => [
+                { 'oid' => sample_oid,
                   'size' => sample_size,
                   'actions' => {
                     'download' => {
                       'href' => "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}",
-                    'header' => {'Authorization' => @auth}
+                      'header' => { 'Authorization' => @auth }
                     }
                   }
                 }])
@@ -298,9 +297,8 @@ describe Gitlab::Lfs::Router do
               expect(response.first).to eq(200)
               response_body = ActiveSupport::JSON.decode(response.last.first)
 
-              expect(response_body).to eq(
-                                         'objects' => [{
-                                                         'oid' => sample_oid,
+              expect(response_body).to eq('objects' => [
+                { 'oid' => sample_oid,
                   'size' => sample_size,
                   'error' => {
                     'code' => 404,
@@ -312,12 +310,11 @@ describe Gitlab::Lfs::Router do
 
           context 'when downloading a lfs object that does not exist' do
             before do
-              body = {
-                'objects' => [{
-                                'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
+              body = { 'operation' => 'download',
+                       'objects' => [
+                         { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
                            'size' => 1575078
-                              }],
-                'operation' => 'download'
+                         }]
               }.to_json
               env['rack.input'] = StringIO.new(body)
             end
@@ -327,9 +324,8 @@ describe Gitlab::Lfs::Router do
               expect(response.first).to eq(200)
               response_body = ActiveSupport::JSON.decode(response.last.first)
 
-              expect(response_body).to eq(
-                                         'objects' => [{
-                                                         'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
+              expect(response_body).to eq('objects' => [
+                { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
                   'size' => 1575078,
                   'error' => {
                     'code' => 404,
@@ -341,7 +337,7 @@ describe Gitlab::Lfs::Router do
 
           context 'when downloading one new and one existing lfs object' do
             before do
-              body = {
+              body = { 'operation' => 'download',
                        'objects' => [
                          { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
                            'size' => 1575078
@@ -349,8 +345,7 @@ describe Gitlab::Lfs::Router do
                          { 'oid' => sample_oid,
                            'size' => sample_size
                          }
-                ],
-                'operation' => 'download'
+                       ]
               }.to_json
               env['rack.input'] = StringIO.new(body)
               project.lfs_objects << lfs_object
@@ -361,22 +356,20 @@ describe Gitlab::Lfs::Router do
               expect(response.first).to eq(200)
               response_body = ActiveSupport::JSON.decode(response.last.first)
 
-              expect(response_body).to eq(
-                                         'objects' => [{
-                                                         'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
+              expect(response_body).to eq('objects' => [
+                { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
                   'size' => 1575078,
                   'error' => {
                     'code' => 404,
                     'message' => "Object does not exist on the server or you don't have permissions to access it",
                   }
                 },
-                                                       {
-                                                         'oid' => sample_oid,
+                { 'oid' => sample_oid,
                   'size' => sample_size,
                   'actions' => {
                     'download' => {
                       'href' => "#{project.http_url_to_repo}/gitlab-lfs/objects/#{sample_oid}",
-                                                             'header' => {'Authorization' => @auth}
+                      'header' => { 'Authorization' => @auth }
                     }
                   }
                 }])
@@ -411,11 +404,12 @@ describe Gitlab::Lfs::Router do
 
       context 'when user is not authenticated' do
         before do
-          body = { 'objects' => [{
-                                   'oid' => sample_oid,
+          body = { 'operation' => 'download',
+                   'objects' => [
+                     { 'oid' => sample_oid,
                        'size' => sample_size
                      }],
-                   'operation' => 'download'
+
           }.to_json
           env['rack.input'] = StringIO.new(body)
         end
@@ -430,9 +424,8 @@ describe Gitlab::Lfs::Router do
             expect(response.first).to eq(200)
             response_body = ActiveSupport::JSON.decode(response.last.first)
 
-            expect(response_body).to eq(
-                                       'objects' => [{
-                                                       'oid' => sample_oid,
+            expect(response_body).to eq('objects' => [
+              { 'oid' => sample_oid,
                 'size' => sample_size,
                 'actions' => {
                   'download' => {
@@ -459,11 +452,11 @@ describe Gitlab::Lfs::Router do
     describe 'upload' do
       describe 'when user is authenticated' do
         before do
-          body = { 'objects' => [{
-                     'oid' => sample_oid,
+          body = { 'operation' => 'upload',
+                   'objects' => [
+                     { 'oid' => sample_oid,
                        'size' => sample_size
-                    }],
-                    'operation' => 'upload'
+                     }]
           }.to_json
           env['rack.input'] = StringIO.new(body)
         end
@@ -472,7 +465,7 @@ describe Gitlab::Lfs::Router do
           before do
             @auth = authorize(user)
             env["HTTP_AUTHORIZATION"] = @auth
-            project.team << [user, :master]
+            project.team << [user, :developer]
           end
 
           context 'when pushing an lfs object that already exists' do
@@ -489,18 +482,18 @@ describe Gitlab::Lfs::Router do
               expect(response['objects'].first['size']).to eq(sample_size)
               expect(lfs_object.projects.pluck(:id)).to_not include(project.id)
               expect(lfs_object.projects.pluck(:id)).to include(public_project.id)
-              expect(response['objects'].first).to have_key('_links')
+              expect(response['objects'].first['actions']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}.git/gitlab-lfs/objects/#{sample_oid}/#{sample_size}")
+              expect(response['objects'].first['actions']['upload']['header']).to eq('Authorization' => @auth)
             end
           end
 
           context 'when pushing a lfs object that does not exist' do
             before do
-              body = {
-                'objects' => [{
-                  'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
+              body = { 'operation' => 'upload',
+                       'objects' => [
+                         { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
                            'size' => 1575078
-                  }],
-                'operation' => 'upload'
+                         }]
               }.to_json
               env['rack.input'] = StringIO.new(body)
             end
@@ -514,14 +507,14 @@ describe Gitlab::Lfs::Router do
               expect(response_body['objects'].first['oid']).to eq("91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897")
               expect(response_body['objects'].first['size']).to eq(1575078)
               expect(lfs_object.projects.pluck(:id)).not_to include(project.id)
-              expect(response_body['objects'].first['_links']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}.git/gitlab-lfs/objects/91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897/1575078")
-              expect(response_body['objects'].first['_links']['upload']['header']).to eq("Authorization" => @auth)
+              expect(response_body['objects'].first['actions']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}.git/gitlab-lfs/objects/91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897/1575078")
+              expect(response_body['objects'].first['actions']['upload']['header']).to eq('Authorization' => @auth)
             end
           end
 
           context 'when pushing one new and one existing lfs object' do
             before do
-              body = {
+              body = { 'operation' => 'upload',
                        'objects' => [
                          { 'oid' => '91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897',
                            'size' => 1575078
@@ -529,11 +522,10 @@ describe Gitlab::Lfs::Router do
                          { 'oid' => sample_oid,
                            'size' => sample_size
                          }
-                ],
-                'operation' => 'upload'
+                       ]
               }.to_json
               env['rack.input'] = StringIO.new(body)
-              public_project.lfs_objects << lfs_object
+              project.lfs_objects << lfs_object
             end
 
             it "responds with status 200 with upload hypermedia link for the new object" do
@@ -543,17 +535,14 @@ describe Gitlab::Lfs::Router do
               response_body = ActiveSupport::JSON.decode(response.last.first)
               expect(response_body['objects']).to be_kind_of(Array)
 
-
               expect(response_body['objects'].first['oid']).to eq("91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897")
               expect(response_body['objects'].first['size']).to eq(1575078)
-              expect(response_body['objects'].first['_links']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}.git/gitlab-lfs/objects/91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897/1575078")
-              expect(response_body['objects'].first['_links']['upload']['header']).to eq("Authorization" => @auth)
+              expect(response_body['objects'].first['actions']['upload']['href']).to eq("#{Gitlab.config.gitlab.url}/#{project.path_with_namespace}.git/gitlab-lfs/objects/91eff75a492a3ed0dfcb544d7f31326bc4014c8551849c192fd1e48d4dd2c897/1575078")
+              expect(response_body['objects'].first['actions']['upload']['header']).to eq("Authorization" => @auth)
 
               expect(response_body['objects'].last['oid']).to eq(sample_oid)
               expect(response_body['objects'].last['size']).to eq(sample_size)
-              expect(lfs_object.projects.pluck(:id)).to_not include(project.id)
-              expect(lfs_object.projects.pluck(:id)).to include(public_project.id)
-              expect(response_body['objects'].last).to have_key('_links')
+              expect(response_body['objects'].last).to_not have_key('actions')
             end
           end
         end
@@ -592,11 +581,11 @@ describe Gitlab::Lfs::Router do
 
     describe 'unsupported' do
       before do
-        body = { 'objects' => [{
-          'oid' => sample_oid,
+        body = { 'operation' => 'other',
+                 'objects' => [
+                   { 'oid' => sample_oid,
                      'size' => sample_size
-        }],
-          'operation' => 'other'
+                   }]
         }.to_json
         env['rack.input'] = StringIO.new(body)
       end