rubocop fixes

CDLUC3 · Jan 12, 2024 · 166930c · 166930c
1 parent 12c6855
commit 166930c
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 29 deletions.
diff --git a/app/controllers/file_controller.rb b/app/controllers/file_controller.rb
@@ -57,7 +57,7 @@ def check_download
       return if current_user_can_download?(obj)
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry
@@ -86,7 +86,7 @@ def storage_key_do
       do_storage_key_do
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry
@@ -222,7 +222,7 @@ def load_file
       raise ActiveRecord::RecordNotFound if @file.nil?
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry

diff --git a/app/controllers/object_controller.rb b/app/controllers/object_controller.rb
@@ -37,7 +37,7 @@ def load_object
       @object = InvObject.where('ark = ?', params_u(:object)).includes(:inv_collections, inv_versions: [:inv_files]).first
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry
@@ -105,7 +105,7 @@ def recent
       do_recent
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry

diff --git a/app/models/inv_object.rb b/app/models/inv_object.rb
@@ -63,7 +63,7 @@ def dua_exists?
       !inv_duas.blank?
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry
@@ -96,7 +96,7 @@ def current_version
     # :nocov:
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry
@@ -111,7 +111,7 @@ def inv_collection
     # :nocov:
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry
@@ -134,7 +134,7 @@ def all_local_ids
     # :nocov:
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry
@@ -226,7 +226,7 @@ def object_info_add_versions(json, maxfile)
       # :nocov:
       rescue StandardError => e
         retries += 1
-        raise(RetryException.new(e)) if retries > RETRY_LIMIT
+        raise RetryException, e if retries > RETRY_LIMIT
 
         sleep 1
         retry

diff --git a/app/models/inv_version.rb b/app/models/inv_version.rb
@@ -28,7 +28,7 @@ def total_size
     # :nocov:
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry
@@ -43,7 +43,7 @@ def system_files
     # :nocov:
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry
@@ -58,7 +58,7 @@ def producer_files
     # :nocov:
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry
@@ -73,7 +73,7 @@ def metadata(element)
     # :nocov:
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry
@@ -107,7 +107,7 @@ def total_actual_size
       inv_files.sum('full_size')
     rescue StandardError => e
       retries += 1
-      raise(RetryException.new(e)) if retries > RETRY_LIMIT
+      raise RetryException, e if retries > RETRY_LIMIT
 
       sleep 1
       retry

diff --git a/spec/controllers/file_controller_spec.rb b/spec/controllers/file_controller_spec.rb
@@ -164,9 +164,9 @@ def my_presign_wrapper
         .with(any_args)
         .and_raise(Mysql2::Error::ConnectionError.new('Simulate Failure'))
 
-      expect{
+      expect do
         get(:presign, params: params)
-      }.to raise_error(RetryException)
+      end.to raise_error(RetryException)
     end
 
     it 'redirects to presign url for the file - retry failure on object retreival' do
@@ -178,9 +178,9 @@ def my_presign_wrapper
         .with(any_args)
         .and_raise(Mysql2::Error::ConnectionError.new('Simulate Failure'))
 
-      expect{
+      expect do
         get(:presign, params: params)
-      }.to raise_error(RetryException)
+      end.to raise_error(RetryException)
     end
 
     it 'redirects to presign url for the file - retry version check' do
@@ -192,9 +192,9 @@ def my_presign_wrapper
         .with(any_args)
         .and_raise(Mysql2::Error::ConnectionError.new('Simulate Failure'))
 
-      expect{
+      expect do
         get(:presign, params: params)
-      }.to raise_error(RetryException)
+      end.to raise_error(RetryException)
     end
 
     it 'redirects to presign url for the file - retry dua check' do
@@ -206,9 +206,9 @@ def my_presign_wrapper
         .with(any_args)
         .and_raise(Mysql2::Error::ConnectionError.new('Simulate Failure'))
 
-      expect{
+      expect do
         get(:presign, params: params)
-      }.to raise_error(RetryException)
+      end.to raise_error(RetryException)
     end
 
     it 'test ark encoding recovery' do

diff --git a/spec/controllers/object_controller_spec.rb b/spec/controllers/object_controller_spec.rb
@@ -237,9 +237,9 @@
           .with(any_args)
           .and_raise(Mysql2::Error::ConnectionError.new('Simulate Failure'))
 
-        expect{
+        expect do
           get(:index, params: { object: object_ark })
-        }.to raise_error(RetryException)
+        end.to raise_error(RetryException)
       end
 
     end
@@ -772,9 +772,9 @@
           .with(any_args)
           .and_raise(Mysql2::Error::ConnectionError.new('Simulate Failure'))
 
-        expect{
+        expect do
           get(:recent, params: { collection: collection.ark })
-        }.to raise_error(RetryException)
+        end.to raise_error(RetryException)
       end
 
       it 'gets the list of objects - no collection permissions' do

diff --git a/spec/controllers/version_controller_spec.rb b/spec/controllers/version_controller_spec.rb
@@ -59,9 +59,9 @@
         .with(any_args)
         .and_raise(Mysql2::Error::ConnectionError.new('Simulate Failure'))
 
-      expect{
+      expect do
         get(:download, params: params)
-      }.to raise_error(RetryException)
+      end.to raise_error(RetryException)
     end
 
     it 'prevents download when download size exceeded' do