Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test PR to validate new test command in CI #95

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Apply to all files
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

# Ruby specific rules
[{*.rb,Fastfile,Gemfile}]
indent_style = space
indent_size = 2

[*.{swift,h,m}]
indent_style = space
indent_size = 4
9 changes: 1 addition & 8 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,4 @@ jobs:
with:
xcode-version: ${{ matrix.xcode }}
- name: Build and Test
run: |
xcodebuild test \
-project Demo/ParselyDemo.xcodeproj \
-scheme ParselyDemo \
-sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=iPhone 14,OS=latest' \
| xcpretty \
&& exit ${PIPESTATUS[0]}
run: make test
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,7 @@ xcuserdata/*

# Ruby tooling
vendor/bundle


# SwiftLint Remote Config Cache
.swiftlint/RemoteConfigCache
7 changes: 7 additions & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
swiftlint_version: 0.57.0

parent_config: https://raw.githubusercontent.com/Automattic/swiftlint-config/b497131f8d0fddbf3b23278cfc4ef8d86c9bcb20/.swiftlint.yml
remote_timeout: 10.0

excluded:
- .build
22 changes: 22 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# TODO: Use newer Sim. Sticking with it at the moment because we know it works in the existing GitHub action setup.
SIMULATOR_NAME ?= iPhone 14
SIMULATOR_OS ?= latest
XCODE_PATH ?= /Applications/Xcode.app

# Convenience to open the lib and demo project with Xcode, given it's not in the root.
open:
open -a $(XCODE_PATH) ./Demo/ParselyDemo.xcodeproj

# TODO: Move off xcpretty to xcbeautify. Sticking with it at the moment because we know it works in the existing GitHub action setup.
test:
set -o pipefail \
&& xcodebuild test \
-project Demo/ParselyDemo.xcodeproj \
-scheme ParselyDemo \
-sdk iphonesimulator \
-destination 'platform=iOS Simulator,name=$(SIMULATOR_NAME),OS=$(SIMULATOR_OS)' \
| xcpretty

# TODO: Add automation to set up SwiftLint
format:
swiftlint --fix --format
18 changes: 16 additions & 2 deletions Sources/Track.swift
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ class Track {
parselyTracker.startFlushTimer();

pixel.beacon(event: event)
os_log("Sending an event from Track", log: OSLog.tracker, type:.debug)
dump(event.toDict())
os_log_sending_event(event)
}

func pageview(url: String, urlref: String = "", metadata: ParselyMetadata?, extra_data: Dictionary<String, Any>?, idsite: String) {
Expand Down Expand Up @@ -82,3 +81,18 @@ class Track {
videoManager.sendHeartbeats()
}
}

/// Utitlity to log sending event with a dump of the event.
private func os_log_sending_event(_ event: Event, log: OSLog = .tracker, type: OSLogType = .debug) {
var eventDump = DumpOutput()
dump(event.toDict(), to: &eventDump)
os_log("Sending an event from Track:\n%@", log: log, type: type, eventDump.content)
}

private struct DumpOutput: TextOutputStream {
private(set) var content = ""

mutating func write(_ string: String) {
content.append(string)
}
}
4 changes: 4 additions & 0 deletions Tests/EngagedTimeTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ class EngagedTimeTests: ParselyTestCase {

let testUrl: String = "http://parsely-stuff.com"

func testFailOnPurpose() {
XCTAssert(false)
}

func testHeartbeatFn() {
let parsely = makePareslyTracker()
let engagedTime = EngagedTime(trackerInstance: parsely)
Expand Down
Loading