danger-dangermattic 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '094bf199c42dcc05762611116e76958dd679f4fd528aee911a0f2e56cef7ec1e'
-  data.tar.gz: 0ea8f18010582cf5d91d0f75a5e7aeadf677fce8bf46fe9d006f0b2cb5985c15
+  metadata.gz: 475e995ad47a8b43461803346efd892f806b60b95714f31fa7ff5c44c7148a80
+  data.tar.gz: 9ce8906845c50e840c4e129f419f93d7907fb3cc001daeaa8cb66db1390d2de3
 SHA512:
-  metadata.gz: 477a907cde572da9e3c5a76eee541e38b82a240a12b8691dec4c2a1697ebb7a664b80836d5eca45513d26a95e270e67b9cbcde08562f9abb691684fa47a21b93
-  data.tar.gz: cc0e1a03b5ddb87b3a7961665f7318feceaff2efe437d261b484c5fad1455a78872c719baee93642d0698dc24314bbc4a22cdb9218c8bc80c7ae6997bfbf55f3
+  metadata.gz: 87f999a8b4c043997a558305046a8263c0218ce2c14da8359ff1d998d55690345bacd1914c2ef75417503cd54dcb1b99f59c5deaa40f1ea0508c09a7804a8365
+  data.tar.gz: 13916d9ab80f9ab9e1e9252a431e0807198f11130d199b1d144b7d9baaad7416289f9b72ce11fc90384da2d63f49fb358b4414c9fade23d5658bf588f65b0530

data/CHANGELOG.md

@@ -20,6 +20,13 @@ _None_
 
 _None_
 
+## 1.2.1
+
+### Bug Fixes
+
+- Fix `android_unit_test_checker` plugin so it doesn't detect private, enum, and data classes. [#92]
+- `view_changes_checker`:  update view checker regex to cover GHE user storage URLs [#91]
+
 ## 1.2.0
 
 ### New Features

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    danger-dangermattic (1.2.0)
+    danger-dangermattic (1.2.1)
       danger (~> 9.4)
       danger-plugin-api (~> 1.0)
       danger-rubocop (~> 0.13)

data/lib/dangermattic/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dangermattic
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/lib/dangermattic/plugins/android_unit_test_checker.rb

@@ -24,7 +24,14 @@ module Danger
   #
   class AndroidUnitTestChecker < Plugin
     ANY_CLASS_DETECTOR = /class\s+([A-Z]\w+)\s*(.*?)\s*{/m
-    NON_PRIVATE_CLASS_DETECTOR = /(?:\s|public|internal|protected|final|abstract|static)*class\s+([A-Z]\w+)\s*(.*?)\s*{/m
+    CLASS_MODIFIER_DETECTOR = /((?:\s|public|internal|protected|private|final|abstract|static|data|enum)*)class\s+([A-Z]\w+)\s*(.*?)\s*{/m
+
+    CLASS_MODIFIER_EXCEPTIONS = [
+      /\s*data\s*/,
+      /\s*private\s*/,
+      /\s*enum\s*/
+    ].freeze
+
     DEFAULT_CLASSES_EXCEPTIONS = [
       /ViewHolder$/,
       /Module$/,
@@ -142,7 +149,7 @@ module Danger
     # @return [Array<ClassViolation>] An array of ClassViolation objects representing the violations found.
     def find_violations(path:, diff_patch:, classes_exceptions:, subclasses_exceptions:)
       added_lines = git_utils.added_lines(diff_patch: diff_patch)
-      matches = added_lines.scan(NON_PRIVATE_CLASS_DETECTOR)
+      matches = added_lines.scan(CLASS_MODIFIER_DETECTOR)
       matches.reject! do |m|
         class_match_is_exception?(
           m,
@@ -152,7 +159,7 @@ module Danger
         )
       end
 
-      matches.map { |m| ClassViolation.new(m[0], path) }
+      matches.map { |m| ClassViolation.new(m[1], path) }
     end
 
     # Finds the names of removed classes based on the removals the diff patch.
@@ -173,10 +180,11 @@ module Danger
     #
     # @return [void]
     def class_match_is_exception?(match, file, classes_exceptions, subclasses_exceptions)
-      return true if classes_exceptions.any? { |re| match[0] =~ re }
+      return true if classes_exceptions.any? { |re| match[1] =~ re }
+      return true if CLASS_MODIFIER_EXCEPTIONS.any? { |re| match[0] =~ re }
 
       subclass_regexp = File.extname(file) == '.java' ? /extends\s+([A-Z]\w+)/m : /\s*:\s*([A-Z]\w+)/m
-      subclass = match[1].scan(subclass_regexp)&.last&.last
+      subclass = match[2].scan(subclass_regexp)&.last&.last
       subclasses_exceptions.any? { |re| subclass =~ re }
     end
 

data/lib/dangermattic/plugins/view_changes_checker.rb

@@ -19,6 +19,7 @@ module Danger
       %r{https?://\S*\.(gif|jpg|jpeg|png|svg)},
       %r{https?://\S*\.(mp4|avi|mov|mkv)},
       %r{https?://\S*github\S+/\S+/assets/},
+      %r{https?://\S*github\S+/storage/user/},
       /!\[(.*?)\]\((.*?)\)/,
       /<img\s+[^>]*src\s*=\s*[^>]*>/,
       /<video\s+[^>]*src\s*=\s*[^>]*>/

data/spec/android_unit_test_checker_spec.rb

@@ -283,6 +283,20 @@ module Danger
 
         expect(@dangerfile).to not_report
       end
+
+      it 'does not report private class' do
+        added_files = %w[
+          PublicAndPrivateType.kt
+          src/androidTest/java/org/test/PublicTypeTest.kt
+        ]
+
+        diff = generate_add_diff_from_fixtures(added_files)
+        allow(@dangerfile.git).to receive(:diff).and_return(diff)
+
+        @plugin.check_missing_tests
+
+        expect(@dangerfile).to not_report
+      end
     end
 
     def generate_add_diff_from_fixtures(paths)

data/spec/fixtures/android_unit_test_checker/PublicAndPrivateType.kt

@@ -0,0 +1,7 @@
+class PublicType {
+    fun print() = "Hello, ${PrivateType().print()}!"
+}
+
+private class PrivateType {
+    fun print() = "World"
+}

data/spec/fixtures/android_unit_test_checker/src/androidTest/java/org/test/PublicTypeTest.kt

@@ -0,0 +1,4 @@
+class PublicTypeTest
+{
+    fun test() { PublicType().print() }
+}

data/spec/view_changes_checker_spec.rb

@@ -92,6 +92,15 @@ module Danger
 
         expect(@dangerfile).to not_report
       end
+
+      it 'does nothing when a PR with view code changes has a video defined with a simple GHE storage user files URL' do
+        allow(@plugin.github).to receive(:pr_body)
+          .and_return("see image:\nhttps://github.tumblr.net/storage/user/1327/files/9b6fde2b-b20e-4d82-938a-6fab63897723 body body")
+
+        @plugin.check
+
+        expect(@dangerfile).to not_report
+      end
     end
 
     shared_examples 'PR without view code changes' do |modified_files|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danger-dangermattic
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Automattic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-01 00:00:00.000000000 Z
+date: 2024-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: danger
@@ -249,6 +249,7 @@ files:
 - spec/fixtures/android_unit_test_checker/AnotherViewHelper.kt
 - spec/fixtures/android_unit_test_checker/MyNewClass.java
 - spec/fixtures/android_unit_test_checker/Polygon.kt
+- spec/fixtures/android_unit_test_checker/PublicAndPrivateType.kt
 - spec/fixtures/android_unit_test_checker/Shape.kt
 - spec/fixtures/android_unit_test_checker/TestsINeedThem.java
 - spec/fixtures/android_unit_test_checker/TestsINeedThem.kt
@@ -263,6 +264,7 @@ files:
 - spec/fixtures/android_unit_test_checker/src/androidTest/java/org/test/AbcTests.java
 - spec/fixtures/android_unit_test_checker/src/androidTest/java/org/test/AnotherTestClass.java
 - spec/fixtures/android_unit_test_checker/src/androidTest/java/org/test/PolygonTest.kt
+- spec/fixtures/android_unit_test_checker/src/androidTest/java/org/test/PublicTypeTest.kt
 - spec/fixtures/android_unit_test_checker/src/androidTest/java/org/test/TestMyNewClass.java
 - spec/fixtures/android_unit_test_checker/src/androidTest/java/org/test/ToolTest.kt
 - spec/fixtures/android_unit_test_checker/src/main/java/org/wordpress/android/widgets/NestedWebView.kt