Merge pull request #121 from smartmobilefactory/feature/projectSwiftlint-UnitTest

Feature/project swiftlint unit test

Author: Tomusm

SwiftLint/copy-and-run-swiftlint-config.sh

@@ -238,10 +238,22 @@ if [ $isFramework = true ]; then
 	merge_swiftlint_configuration "swiftlint+frameworks.yml" "$tmpFile" "--write-to-file" "$tmpFile.frameworks"
 	mv "$tmpFile.frameworks" "$tmpFile"
 
+	unitTestDir="false"
+	# Find the unit test directory
 	if [ -e "$projectDir/Unit-Tests" ]; then
-		cp "swiftlint+frameworksUnitTest.yml" "$projectDir/Unit-Tests/.swiftlint.yml"
+		unitTestDir="$projectDir/Unit-Tests"
 	elif [ -e "$projectDir/UnitTests" ]; then
-		cp "swiftlint+frameworksUnitTest.yml" "$projectDir/UnitTests/.swiftlint.yml"
+		unitTestDir="$projectDir/UnitTests"
+	fi
+
+	if [ -e $unitTestDir ] && [ $unitTestDir != "false" ]; then
+		if [ -f "$unitTestDir/.project-swiftlint.yml" ]; then
+			# Deals with .project-swiftlint.yml for unit tests
+			rm "$unitTestDir/.swiftlint.yml"
+			merge_swiftlint_configuration "$unitTestDir/.project-swiftlint.yml" "swiftlint+frameworksUnitTest.yml" "--write-to-file" "$unitTestDir/.swiftlint.yml"
+		else
+			cp "swiftlint+frameworksUnitTest.yml" "$unitTestDir/.swiftlint.yml"
+		fi
 	fi
 fi
 

SwiftLint/swiftlint.yml

@@ -61,7 +61,6 @@ opt_in_rules:
   - contains_over_first_not_nil
   - empty_collection_literal
   - empty_string
-  - explicit_self
   - file_name
   - for_where
   - joined_default_parameter
@@ -79,11 +78,14 @@ opt_in_rules:
   - static_operator
   - toggle_bool
   - unowned_variable_capture
-  - unused_import
   - vertical_whitespace_closing_braces
   - single_test_class
   - strong_iboutlet
 
+analyzer_rules: # Rules run by `swiftlint analyze` (experimental)
+  - explicit_self
+  - unused_import
+
 # rule parameters
 file_length:
   warning: 600