[ci] Fix IndentationConsistency complains

openSUSE · Dec 13, 2017 · 0c2bad0 · 0c2bad0
1 parent bd9d5e6
commit 0c2bad0
Show file tree

Hide file tree

Showing 4 changed files with 129 additions and 139 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -20,16 +20,6 @@ Layout/DotPosition:
 Layout/IndentHash:
   Enabled: false
 
-# Offense count: 8
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: normal, rails
-Layout/IndentationConsistency:
-  Exclude:
-    - 'src/api/app/controllers/webui/configuration_controller.rb'
-    - 'src/api/test/functional/statistics_controller_test.rb'
-    - 'src/api/test/unit/ichain_notifier_test.rb'
-
 # Offense count: 3
 # Cop supports --auto-correct.
 # Configuration parameters: Width, IgnoredPatterns.

diff --git a/src/api/app/controllers/webui/configuration_controller.rb b/src/api/app/controllers/webui/configuration_controller.rb
@@ -32,16 +32,16 @@ def update
 
   private
 
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def project_params
-      params.require(:project).permit(:name, :title, :remoteurl, :description)
-    end
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def project_params
+    params.require(:project).permit(:name, :title, :remoteurl, :description)
+  end
 
-    def configuration_params
-      params.require(:configuration).permit(:name, :title, :description, :unlisted_projects_filter, :unlisted_projects_filter_description)
-    end
+  def configuration_params
+    params.require(:configuration).permit(:name, :title, :description, :unlisted_projects_filter, :unlisted_projects_filter_description)
+  end
 
-    def set_configuration
-      @configuration = ::Configuration.first
-    end
+  def set_configuration
+    @configuration = ::Configuration.first
+  end
 end
diff --git a/src/api/test/functional/statistics_controller_test.rb b/src/api/test/functional/statistics_controller_test.rb
@@ -52,122 +52,122 @@ def test_latest_added
     assert_response :success
   end
 
- def test_latest_updated
-   login_adrian
-   get url_for(controller: :source, action: :show_package_meta, project: "HiddenProject", package: "test_latest_added")
-   assert_response 404
-   put url_for(controller: :source, action: :update_package_meta, project: "HiddenProject", package: "test_latest_added"),
-       params: '<package project="HiddenProject" name="test_latest_added"> <title/> <description/> </package>'
-   assert_response 200
-   assert_xml_tag( tag: "status", attributes: { code: "ok"} )
-
-   get url_for(controller: :statistics, action: :latest_updated)
-   assert_response :success
-   assert_xml_tag tag: 'latest_updated', child: { tag: 'package' }
-   assert_xml_tag tag: 'package', attributes: { name: "test_latest_added" }
-
-   login_tom
-   get url_for(controller: :statistics, action: :latest_updated)
-   assert_response :success
-   assert_xml_tag tag: 'latest_updated', child: { tag: 'package' }
-   assert_xml_tag tag: 'package', attributes: {
-     name: "Pack3"
-   }
-
-   login_fred
-   get url_for(controller: :source, action: :show_package_meta, project: "kde4", package: "test_latest_added1")
-   assert_response 404
-   put url_for(controller: :source, action: :update_package_meta, project: "kde4", package: "test_latest_added1"),
-       params: '<package project="kde4" name="test_latest_added1"> <title/> <description/> </package>'
-   assert_response 200
-   assert_xml_tag( tag: "status", attributes: { code: "ok"} )
-
-   get url_for(controller: :statistics, action: :latest_updated)
-   assert_response :success
-   assert_xml_tag tag: 'latest_updated', child: { tag: 'package' }
-   assert_xml_tag tag: 'package', attributes: { name: "test_latest_added1" }
-
-   login_king
-   delete "/source/kde4/test_latest_added1"
-   assert_response :success
-   delete "/source/HiddenProject/test_latest_added"
-   assert_response :success
- end
-
- def test_timestamp_calls
-   login_adrian
-   get url_for(controller: :statistics, action: :added_timestamp, project: "HiddenProject", package: "pack")
-   assert_response 200
-
-   get url_for(controller: :statistics, action: :updated_timestamp, project: "HiddenProject", package: "pack")
-   assert_response 200
-
-   get url_for(controller: :statistics, action: :added_timestamp, project: "kde4", package: "kdelibs")
-   assert_response 200
-
-   get url_for(controller: :statistics, action: :updated_timestamp, project: "kde4", package: "kdelibs")
-   assert_response 200
-
-   login_fred
-   get url_for(controller: :statistics, action: :added_timestamp, project: "kde4", package: "kdelibs")
-   assert_response 200
-
-   get url_for(controller: :statistics, action: :updated_timestamp, project: "kde4", package: "kdelibs")
-   assert_response 200
-
-   get url_for(controller: :statistics, action: :added_timestamp, project: "HiddenProject", package: "not_existing")
-   assert_response 404
-
-   get url_for(controller: :statistics, action: :updated_timestamp, project: "HiddenProject", package: "not_existing")
-   assert_response 404
-
-   get url_for(controller: :statistics, action: :added_timestamp, project: "HiddenProject")
-   assert_response 404
-
-   get url_for(controller: :statistics, action: :updated_timestamp, project: "HiddenProject")
-   assert_response 404
- end
-
- def test_rating_and_activity
-   login_adrian
-   get url_for(controller: :statistics, action: :rating, project: "kde4", package: "kdelibs")
-   assert_response :success
-
-   get url_for(controller: :statistics, action: :rating, project: "kde4")
-   assert_response :success
-
-   get url_for(controller: :statistics, action: :rating, project: "HiddenProject", package: "NOT_EXISTING")
-   assert_response 404
-
-   get url_for(controller: :statistics, action: :rating, project: "HiddenProject", package: nil)
-   assert_response :success
-
-   get url_for(controller: :statistics, action: :activity, project: "kde4", package: "kdelibs")
-   assert_response :success
-
-   get url_for(controller: :statistics, action: :activity, project: "kde4", package: nil)
-   assert_response :success
-
-   get url_for(controller: :statistics, action: :activity, project: "HiddenProject", package: "pack")
-   assert_response :success
-
-   get url_for(controller: :statistics, action: :activity, project: "HiddenProject", package: nil)
-   assert_response :success
-
-   # no access to HiddenProject
-   login_fred
-   get url_for(controller: :statistics, action: :rating, project: "kde4", package: "kdelibs")
-   assert_response :success
+  def test_latest_updated
+    login_adrian
+    get url_for(controller: :source, action: :show_package_meta, project: "HiddenProject", package: "test_latest_added")
+    assert_response 404
+    put url_for(controller: :source, action: :update_package_meta, project: "HiddenProject", package: "test_latest_added"),
+        params: '<package project="HiddenProject" name="test_latest_added"> <title/> <description/> </package>'
+    assert_response 200
+    assert_xml_tag( tag: "status", attributes: { code: "ok"} )
+
+    get url_for(controller: :statistics, action: :latest_updated)
+    assert_response :success
+    assert_xml_tag tag: 'latest_updated', child: { tag: 'package' }
+    assert_xml_tag tag: 'package', attributes: { name: "test_latest_added" }
+
+    login_tom
+    get url_for(controller: :statistics, action: :latest_updated)
+    assert_response :success
+    assert_xml_tag tag: 'latest_updated', child: { tag: 'package' }
+    assert_xml_tag tag: 'package', attributes: {
+      name: "Pack3"
+    }
+
+    login_fred
+    get url_for(controller: :source, action: :show_package_meta, project: "kde4", package: "test_latest_added1")
+    assert_response 404
+    put url_for(controller: :source, action: :update_package_meta, project: "kde4", package: "test_latest_added1"),
+        params: '<package project="kde4" name="test_latest_added1"> <title/> <description/> </package>'
+    assert_response 200
+    assert_xml_tag( tag: "status", attributes: { code: "ok"} )
+
+    get url_for(controller: :statistics, action: :latest_updated)
+    assert_response :success
+    assert_xml_tag tag: 'latest_updated', child: { tag: 'package' }
+    assert_xml_tag tag: 'package', attributes: { name: "test_latest_added1" }
+
+    login_king
+    delete "/source/kde4/test_latest_added1"
+    assert_response :success
+    delete "/source/HiddenProject/test_latest_added"
+    assert_response :success
+  end
+
+  def test_timestamp_calls
+    login_adrian
+    get url_for(controller: :statistics, action: :added_timestamp, project: "HiddenProject", package: "pack")
+    assert_response 200
+
+    get url_for(controller: :statistics, action: :updated_timestamp, project: "HiddenProject", package: "pack")
+    assert_response 200
+
+    get url_for(controller: :statistics, action: :added_timestamp, project: "kde4", package: "kdelibs")
+    assert_response 200
 
-   get url_for(controller: :statistics, action: :rating, project: "HiddenProject", package: nil)
-   assert_response 404
+    get url_for(controller: :statistics, action: :updated_timestamp, project: "kde4", package: "kdelibs")
+    assert_response 200
+
+    login_fred
+    get url_for(controller: :statistics, action: :added_timestamp, project: "kde4", package: "kdelibs")
+    assert_response 200
+
+    get url_for(controller: :statistics, action: :updated_timestamp, project: "kde4", package: "kdelibs")
+    assert_response 200
+
+    get url_for(controller: :statistics, action: :added_timestamp, project: "HiddenProject", package: "not_existing")
+    assert_response 404
+
+    get url_for(controller: :statistics, action: :updated_timestamp, project: "HiddenProject", package: "not_existing")
+    assert_response 404
+
+    get url_for(controller: :statistics, action: :added_timestamp, project: "HiddenProject")
+    assert_response 404
+
+    get url_for(controller: :statistics, action: :updated_timestamp, project: "HiddenProject")
+    assert_response 404
+  end
+
+  def test_rating_and_activity
+    login_adrian
+    get url_for(controller: :statistics, action: :rating, project: "kde4", package: "kdelibs")
+    assert_response :success
+
+    get url_for(controller: :statistics, action: :rating, project: "kde4")
+    assert_response :success
 
-   get url_for(controller: :statistics, action: :rating, project: "HiddenProject", package: "NOT_EXISTING")
-   assert_response 404
+    get url_for(controller: :statistics, action: :rating, project: "HiddenProject", package: "NOT_EXISTING")
+    assert_response 404
+
+    get url_for(controller: :statistics, action: :rating, project: "HiddenProject", package: nil)
+    assert_response :success
+
+    get url_for(controller: :statistics, action: :activity, project: "kde4", package: "kdelibs")
+    assert_response :success
+
+    get url_for(controller: :statistics, action: :activity, project: "kde4", package: nil)
+    assert_response :success
+
+    get url_for(controller: :statistics, action: :activity, project: "HiddenProject", package: "pack")
+    assert_response :success
+
+    get url_for(controller: :statistics, action: :activity, project: "HiddenProject", package: nil)
+    assert_response :success
+
+    # no access to HiddenProject
+    login_fred
+    get url_for(controller: :statistics, action: :rating, project: "kde4", package: "kdelibs")
+    assert_response :success
+
+    get url_for(controller: :statistics, action: :rating, project: "HiddenProject", package: nil)
+    assert_response 404
+
+    get url_for(controller: :statistics, action: :rating, project: "HiddenProject", package: "NOT_EXISTING")
+    assert_response 404
 
-   get url_for(controller: :statistics, action: :activity, project: "kde4", package: "kdelibs")
-   assert_response :success
- end
+    get url_for(controller: :statistics, action: :activity, project: "kde4", package: "kdelibs")
+    assert_response :success
+  end
 
   def test_most_active
     login_tom

diff --git a/src/api/test/unit/ichain_notifier_test.rb b/src/api/test/unit/ichain_notifier_test.rb
@@ -44,11 +44,11 @@ def setup
 
   private
 
-    def read_fixture(action)
-      IO.readlines("#{ActionController::TestCase.fixture_path}/ichain_notifier/#{action}")
-    end
+  def read_fixture(action)
+    IO.readlines("#{ActionController::TestCase.fixture_path}/ichain_notifier/#{action}")
+  end
 
-    def encode(subject)
-      quoted_printable(subject, CHARSET)
-    end
+  def encode(subject)
+    quoted_printable(subject, CHARSET)
+  end
 end