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.

Sign up for GitHub

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

Fix tests with AEPTestUtils and other MISC fixes #1002

Merged
merged 21 commits into from
Mar 6, 2024
Merged

Fix tests with AEPTestUtils and other MISC fixes #1002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
eb16be0
start work on updating tests with new test utils
cdhoffmann Jan 23, 2024
a3f8617
progress on updating tests
cdhoffmann Feb 8, 2024
d9076ca
progress on tests
cdhoffmann Feb 15, 2024
d90b5f1
fix some more tests
cdhoffmann Feb 23, 2024
7b58d51
tests passing
cdhoffmann Feb 26, 2024
035d8b0
fix podfile, remove dead file
cdhoffmann Feb 28, 2024
b23de7f
fix podfile
cdhoffmann Feb 28, 2024
93531bf
specify ios 17.0.1 and fix DiskCacheService var
cdhoffmann Mar 1, 2024
a1bbb20
Merge branch 'dev-v5.0.0' into fixJsonTests
cdhoffmann Mar 1, 2024
7419028
try removing iphone / version specification to use default?
cdhoffmann Mar 1, 2024
5257e45
try 15.1
cdhoffmann Mar 1, 2024
44dbaf4
15.1
cdhoffmann Mar 1, 2024
d79f6ad
fix preboot version
cdhoffmann Mar 1, 2024
07a4c5d
use apple tv instead of 4k as 4k has a collision
cdhoffmann Mar 1, 2024
6f3e09f
remove AEPTestUtils pod which caused circular dependency with Core an…
cdhoffmann Mar 4, 2024
8ee60ec
copy over AEPTestUtil files
cdhoffmann Mar 4, 2024
0341d5f
fix aeptestutil placements
cdhoffmann Mar 5, 2024
243df18
remove codecov
cdhoffmann Mar 5, 2024
6b7a6da
Point to rules engine dev branch in package.swift
cdhoffmann Mar 5, 2024
aa5bfc9
remove duplicate imports
cdhoffmann Mar 6, 2024
e43e1ee
ignore resetIdentities integration test till we find a fix for interm…
cdhoffmann Mar 6, 2024
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
114 changes: 57 additions & 57 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
version: 2.1

orbs:
codecov: codecov/[email protected]
# codecov: codecov/[email protected]
macos: circleci/macos@2

# Workflows orchestrate a set of jobs to be run;
Expand Down Expand Up @@ -80,20 +80,20 @@ commands:
steps:
- macos/preboot-simulator:
platform: "iOS"
version: "17.0"
device: "iPhone 15"
version: "17.2"

prestart_tvos_simulator:
steps:
- macos/preboot-simulator:
platform: "tvOS"
version: "17.0"
device: "Apple TV"
version: "17.2"

jobs:
validate-code:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -106,7 +106,7 @@ jobs:

test-ios-core:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -121,14 +121,14 @@ jobs:

# Code coverage upload using Codecov
# See options explanation here: https://docs.codecov.com/docs/codecov-uploader
- codecov/upload:
flags: aepcore-ios-tests
upload_name: Coverage Report for AEPCore iOS Tests
xtra_args: -c -v --xc --xp build/AEPCore-ios.xcresult
# - codecov/upload:
# flags: aepcore-ios-tests
# upload_name: Coverage Report for AEPCore iOS Tests
# xtra_args: -c -v --xc --xp build/AEPCore-ios.xcresult

test-ios-services:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -143,14 +143,14 @@ jobs:

# Code coverage upload using Codecov
# See options explanation here: https://docs.codecov.com/docs/codecov-uploader
- codecov/upload:
flags: aepservices-ios-tests
upload_name: Coverage Report for AEPServices iOS Tests
xtra_args: -c -v --xc --xp build/AEPServices-ios.xcresult
# - codecov/upload:
# flags: aepservices-ios-tests
# upload_name: Coverage Report for AEPServices iOS Tests
# xtra_args: -c -v --xc --xp build/AEPServices-ios.xcresult

test-ios-lifecycle:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -165,14 +165,14 @@ jobs:

# Code coverage upload using Codecov
# See options explanation here: https://docs.codecov.com/docs/codecov-uploader
- codecov/upload:
flags: aeplifecycle-ios-tests
upload_name: Coverage Report for AEPLifecycle iOS Tests
xtra_args: -c -v --xc --xp build/AEPLifecycle-ios.xcresult
# - codecov/upload:
# flags: aeplifecycle-ios-tests
# upload_name: Coverage Report for AEPLifecycle iOS Tests
# xtra_args: -c -v --xc --xp build/AEPLifecycle-ios.xcresult

test-ios-identity:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -187,14 +187,14 @@ jobs:

# Code coverage upload using Codecov
# See options explanation here: https://docs.codecov.com/docs/codecov-uploader
- codecov/upload:
flags: aepidentity-ios-tests
upload_name: Coverage Report for AEPIdentity iOS Tests
xtra_args: -c -v --xc --xp build/AEPIdentity-ios.xcresult
# - codecov/upload:
# flags: aepidentity-ios-tests
# upload_name: Coverage Report for AEPIdentity iOS Tests
# xtra_args: -c -v --xc --xp build/AEPIdentity-ios.xcresult

test-ios-signal:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -209,14 +209,14 @@ jobs:

# Code coverage upload using Codecov
# See options explanation here: https://docs.codecov.com/docs/codecov-uploader
- codecov/upload:
flags: aepsignal-ios-tests
upload_name: Coverage Report for AEPSignal iOS Tests
xtra_args: -c -v --xc --xp build/AEPSignal-ios.xcresult
# - codecov/upload:
# flags: aepsignal-ios-tests
# upload_name: Coverage Report for AEPSignal iOS Tests
# xtra_args: -c -v --xc --xp build/AEPSignal-ios.xcresult

test-ios-integration:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -231,7 +231,7 @@ jobs:

test-tvos-core:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -246,14 +246,14 @@ jobs:

# Code coverage upload using Codecov
# See options explanation here: https://docs.codecov.com/docs/codecov-uploader
- codecov/upload:
flags: aepcore-tvos-tests
upload_name: Coverage Report for AEPCore tvOS Tests
xtra_args: -c -v --xc --xp build/AEPCore-tvos.xcresult
# - codecov/upload:
# flags: aepcore-tvos-tests
# upload_name: Coverage Report for AEPCore tvOS Tests
# xtra_args: -c -v --xc --xp build/AEPCore-tvos.xcresult

test-tvos-services:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -268,14 +268,14 @@ jobs:

# Code coverage upload using Codecov
# See options explanation here: https://docs.codecov.com/docs/codecov-uploader
- codecov/upload:
flags: aepservices-tvos-tests
upload_name: Coverage Report for AEPServices tvOS Tests
xtra_args: -c -v --xc --xp build/AEPServices-tvos.xcresult
# - codecov/upload:
# flags: aepservices-tvos-tests
# upload_name: Coverage Report for AEPServices tvOS Tests
# xtra_args: -c -v --xc --xp build/AEPServices-tvos.xcresult

test-tvos-lifecycle:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -290,14 +290,14 @@ jobs:

# Code coverage upload using Codecov
# See options explanation here: https://docs.codecov.com/docs/codecov-uploader
- codecov/upload:
flags: aeplifecycle-tvos-tests
upload_name: Coverage Report for AEPLifecycle tvOS Tests
xtra_args: -c -v --xc --xp build/AEPLifecycle-tvos.xcresult
# - codecov/upload:
# flags: aeplifecycle-tvos-tests
# upload_name: Coverage Report for AEPLifecycle tvOS Tests
# xtra_args: -c -v --xc --xp build/AEPLifecycle-tvos.xcresult

test-tvos-identity:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -312,14 +312,14 @@ jobs:

# Code coverage upload using Codecov
# See options explanation here: https://docs.codecov.com/docs/codecov-uploader
- codecov/upload:
flags: aepidentity-tvos-tests
upload_name: Coverage Report for AEPIdentity tvOS Tests
xtra_args: -c -v --xc --xp build/AEPIdentity-tvos.xcresult
# - codecov/upload:
# flags: aepidentity-tvos-tests
# upload_name: Coverage Report for AEPIdentity tvOS Tests
# xtra_args: -c -v --xc --xp build/AEPIdentity-tvos.xcresult

test-tvos-signal:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -334,14 +334,14 @@ jobs:

# Code coverage upload using Codecov
# See options explanation here: https://docs.codecov.com/docs/codecov-uploader
- codecov/upload:
flags: aepsignal-tvos-tests
upload_name: Coverage Report for AEPSignal tvOS Tests
xtra_args: -c -v --xc --xp build/AEPSignal-tvos.xcresult
# - codecov/upload:
# flags: aepsignal-tvos-tests
# upload_name: Coverage Report for AEPSignal tvOS Tests
# xtra_args: -c -v --xc --xp build/AEPSignal-tvos.xcresult

test-tvos-integration:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.1 # Specify the Xcode version to use

steps:
- checkout
Expand All @@ -356,7 +356,7 @@ jobs:

test-spm-podspec-archive:
macos:
xcode: 15.0.0 # Specify the Xcode version to use
xcode: 15.0 # Specify the Xcode version to use

steps:
- checkout
Expand Down
Loading