Skip to content

Commit ef7ed40

Browse files
authored
Merge pull request #19 from AddaMeSPB/develop
update SwiftLint yml file and git ignore
2 parents 996abb9 + ad777c1 commit ef7ed40

File tree

6 files changed

+9
-29
lines changed

6 files changed

+9
-29
lines changed

.github/workflows/swift.yml

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
pull_request:
55
branches: [ main ]
66

7+
pull_request:
8+
branches: [ develop ]
9+
710
jobs:
811

912
swiftLint:

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,5 @@ Addame/Configs/Production.xcconfig
117117
*.dSYM.*
118118
/fastlane/report.xml
119119
/fastlane/FastlaneRunner
120+
test_output/report.html
121+
test_output/report.junit

.swiftlint.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
disabled_rules:
2+
- empty_enum_arguments
23
- vertical_parameter_alignment_on_call
34
- weak_delegate
45
- vertical_parameter_alignment

fastlane/Fastfile.swift

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ class Fastfile: LaneFile {
2626
func buildLane() {
2727
desc("Build for testing")
2828
scan(workspace: "Addame.xcworkspace",
29+
scheme: "Addame",
2930
derivedDataPath: "derivedData",
3031
buildForTesting: .userDefined(true),
3132
xcargs: "CI=true")

test_output/report.html

+1-24
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ <h1>Test Results</h1>
110110
</section>
111111
<section class="right">
112112
<section id="counters">
113-
<h2 id="test-count"><span class="number">1</span> tests</h2>
113+
<h2 id="test-count"><span class="number">0</span> tests</h2>
114114

115115
</section>
116116
<section id="segment-bar">
@@ -120,29 +120,6 @@ <h2 id="test-count"><span class="number">1</span> tests</h2>
120120
</header>
121121
<section id="test-suites">
122122

123-
124-
<section class="test-suite passing" id="EventFormViewTests.EventFormViewTests">
125-
<section class="heading" onclick="toggleTests(this);">
126-
<h3 class="title">EventFormViewTests.EventFormViewTests</h3>
127-
</section>
128-
<section class="tests">
129-
<table>
130-
131-
132-
<tr class="test passing " onclick="toggleDetails('testCreatEvent');">
133-
<td>
134-
135-
<h3 class="time">0.030s</h3>
136-
137-
</td>
138-
<td><h3 class="title">testCreatEvent</h3></td>
139-
</tr>
140-
141-
142-
</table>
143-
</section>
144-
</section>
145-
146123
</section>
147124
<footer>Report generated with <a href="https://github.com/supermarin/xcpretty">xcpretty</a></footer>
148125
</body>

test_output/report.junit

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,2 @@
11
<?xml version='1.0' encoding='UTF-8'?>
2-
<testsuites name='EventFormViewTests.xctest' tests='1' failures='0'>
3-
<testsuite name='EventFormViewTests.EventFormViewTests' tests='1' failures='0'>
4-
<testcase classname='EventFormViewTests.EventFormViewTests' name='testCreatEvent' time='0.030'/>
5-
</testsuite>
6-
</testsuites>
2+
<testsuites tests='0' failures='0'/>

0 commit comments

Comments
 (0)