Skip to content

Commit fac0b7f

Browse files
mylyuicmylyuic
authored
turn on travis testing for in-app messaging display (#1887)
1 parent 49ffbb3 commit fac0b7f

File tree

8 files changed

+57
-11
lines changed

8 files changed

+57
-11
lines changed

‎.travis.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ jobs:
3939
script:
4040
- ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
4141

42+
- stage: test
43+
env:
44+
- PROJECT=InAppMessagingDisplay PLATFORM=iOS METHOD=xcodebuild
45+
before_install:
46+
- ./scripts/if_changed.sh ./scripts/install_prereqs.sh
47+
script:
48+
- ./scripts/if_changed.sh ./scripts/build.sh $PROJECT $PLATFORM
49+
4250
- stage: test
4351
env:
4452
- PROJECT=Firestore PLATFORM=iOS METHOD=xcodebuild
@@ -64,6 +72,7 @@ jobs:
6472
- ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseMessaging.podspec
6573
- ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseStorage.podspec
6674
- ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseFunctions.podspec
75+
- ./scripts/if_changed.sh ./scripts/pod_lib_lint.sh FirebaseInAppMessagingDisplay.podspec
6776

6877
- stage: test
6978
env:
@@ -93,6 +102,7 @@ jobs:
93102
- ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseMessaging.podspec --use-libraries --allow-warnings
94103
- ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseStorage.podspec --use-libraries
95104
- ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseFunctions.podspec --use-libraries
105+
- ./scripts/if_cron.sh ./scripts/pod_lib_lint.sh FirebaseInAppMessagingDisplay.podspec --use-libraries
96106

97107
- stage: test
98108
env:

‎InAppMessagingDisplay/Example/FiamDisplaySwiftExample/BannerMessageViewController.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
import UIKit
1818

19-
import FirebaseInAppMessagingDisplay
20-
2119
import FirebaseInAppMessaging
2220

2321
class BannerMessageViewController: CommonMessageTestVC {

‎InAppMessagingDisplay/Example/FiamDisplaySwiftExample/ImageOnlyMessageViewController.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
import UIKit
1717
import FirebaseInAppMessaging
18-
import FirebaseInAppMessagingDisplay
1918

2019
class ImageOnlyMessageViewController: CommonMessageTestVC {
2120
let displayImpl = InAppMessagingDefaultDisplayImpl()

‎InAppMessagingDisplay/Example/FiamDisplaySwiftExample/ModalMessageViewController.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616

1717
import UIKit
18-
import FirebaseInAppMessagingDisplay
1918
import FirebaseInAppMessaging
2019

2120
class ModalMessageViewController: CommonMessageTestVC {

‎InAppMessagingDisplay/Example/InAppMessagingDisplay-Sample.xcodeproj/project.pbxproj

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
5EACA9F21E16E885EEEA6AC5 /* Pods_FiamDisplaySwiftExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1E5AD224A78D3137046BB5AB /* Pods_FiamDisplaySwiftExample.framework */; };
10+
4265DE16D92C99B9A6E56539 /* Pods_FiamDisplaySwiftExample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C72088F73776B875CB106D8 /* Pods_FiamDisplaySwiftExample.framework */; };
1111
AD7200B52124D19200AFD5F3 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD7200B42124D19200AFD5F3 /* AppDelegate.swift */; };
1212
AD7200BA2124D19200AFD5F3 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = AD7200B82124D19200AFD5F3 /* Main.storyboard */; };
1313
AD7200BC2124D19400AFD5F3 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AD7200BB2124D19400AFD5F3 /* Assets.xcassets */; };
@@ -34,8 +34,8 @@
3434

3535
/* Begin PBXFileReference section */
3636
0F66149C0079E8409F390CBE /* Pods-InAppMessagingDisplay-Sample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-InAppMessagingDisplay-Sample.release.xcconfig"; path = "Pods/Target Support Files/Pods-InAppMessagingDisplay-Sample/Pods-InAppMessagingDisplay-Sample.release.xcconfig"; sourceTree = "<group>"; };
37-
1E5AD224A78D3137046BB5AB /* Pods_FiamDisplaySwiftExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FiamDisplaySwiftExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3837
46449F37C45EA76C97C32634 /* Pods-FiamDisplaySwiftExample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FiamDisplaySwiftExample.release.xcconfig"; path = "Pods/Target Support Files/Pods-FiamDisplaySwiftExample/Pods-FiamDisplaySwiftExample.release.xcconfig"; sourceTree = "<group>"; };
38+
5C72088F73776B875CB106D8 /* Pods_FiamDisplaySwiftExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FiamDisplaySwiftExample.framework; sourceTree = BUILT_PRODUCTS_DIR; };
3939
8FF302EB136148B923534F2E /* Pods-FiamDisplaySwiftExample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FiamDisplaySwiftExample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-FiamDisplaySwiftExample/Pods-FiamDisplaySwiftExample.debug.xcconfig"; sourceTree = "<group>"; };
4040
AD7200B22124D19200AFD5F3 /* FiamDisplaySwiftExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FiamDisplaySwiftExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
4141
AD7200B42124D19200AFD5F3 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -62,7 +62,7 @@
6262
isa = PBXFrameworksBuildPhase;
6363
buildActionMask = 2147483647;
6464
files = (
65-
5EACA9F21E16E885EEEA6AC5 /* Pods_FiamDisplaySwiftExample.framework in Frameworks */,
65+
4265DE16D92C99B9A6E56539 /* Pods_FiamDisplaySwiftExample.framework in Frameworks */,
6666
);
6767
runOnlyForDeploymentPostprocessing = 0;
6868
};
@@ -91,7 +91,7 @@
9191
isa = PBXGroup;
9292
children = (
9393
C265D6A970BC7B345291115C /* Pods_InAppMessagingDisplay_Sample.framework */,
94-
1E5AD224A78D3137046BB5AB /* Pods_FiamDisplaySwiftExample.framework */,
94+
5C72088F73776B875CB106D8 /* Pods_FiamDisplaySwiftExample.framework */,
9595
);
9696
name = Frameworks;
9797
sourceTree = "<group>";
@@ -155,8 +155,8 @@
155155
AD7200AE2124D19200AFD5F3 /* Sources */,
156156
AD7200AF2124D19200AFD5F3 /* Frameworks */,
157157
AD7200B02124D19200AFD5F3 /* Resources */,
158-
13AA512D7003940DF3593687 /* [CP] Embed Pods Frameworks */,
159158
0B0EF24B15B4BCBCC06B5C35 /* [CP] Copy Pods Resources */,
159+
4F123C68EFE3A41A52219FAA /* [CP] Embed Pods Frameworks */,
160160
);
161161
buildRules = (
162162
);
@@ -280,7 +280,7 @@
280280
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-FiamDisplaySwiftExample/Pods-FiamDisplaySwiftExample-resources.sh\"\n";
281281
showEnvVarsInLog = 0;
282282
};
283-
13AA512D7003940DF3593687 /* [CP] Embed Pods Frameworks */ = {
283+
4F123C68EFE3A41A52219FAA /* [CP] Embed Pods Frameworks */ = {
284284
isa = PBXShellScriptBuildPhase;
285285
buildActionMask = 2147483647;
286286
files = (
@@ -362,7 +362,10 @@
362362
buildSettings = {
363363
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
364364
CODE_SIGN_STYLE = Automatic;
365-
"HEADER_SEARCH_PATHS[arch=*]" = "\"${PODS_ROOT}/../../../Firebase/InAppMessagingDisplay/\"/** \"${PODS_ROOT}/../../../Firebase/InAppMessaging/\"/**";
365+
"HEADER_SEARCH_PATHS[arch=*]" = (
366+
"\"${PODS_ROOT}/../../../Firebase/InAppMessagingDisplay/\"/**",
367+
"\"${PODS_ROOT}/../../../Firebase/InAppMessaging/\"/**",
368+
);
366369
INFOPLIST_FILE = FiamDisplaySwiftExample/Info.plist;
367370
LD_RUNPATH_SEARCH_PATHS = (
368371
"$(inherited)",
@@ -371,6 +374,7 @@
371374
PRODUCT_BUNDLE_IDENTIFIER = com.google.experimental1.dev.FiamDisplaySwiftExample;
372375
PRODUCT_NAME = "$(TARGET_NAME)";
373376
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
377+
"SWIFT_OBJC_BRIDGING_HEADER[arch=*]" = ../../Firebase/InAppMessagingDisplay/Public/FirebaseInAppMessagingDisplay.h;
374378
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
375379
SWIFT_VERSION = 4.0;
376380
TARGETED_DEVICE_FAMILY = "1,2";
@@ -391,6 +395,7 @@
391395
PRODUCT_BUNDLE_IDENTIFIER = com.google.experimental1.dev.FiamDisplaySwiftExample;
392396
PRODUCT_NAME = "$(TARGET_NAME)";
393397
SWIFT_COMPILATION_MODE = wholemodule;
398+
"SWIFT_OBJC_BRIDGING_HEADER[arch=*]" = ../../Firebase/InAppMessagingDisplay/Public/FirebaseInAppMessagingDisplay.h;
394399
SWIFT_OPTIMIZATION_LEVEL = "-O";
395400
SWIFT_VERSION = 4.0;
396401
TARGETED_DEVICE_FAMILY = "1,2";

‎scripts/build.sh

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ USAGE: $0 product [platform] [method]
2727
product can be one of:
2828
Firebase
2929
Firestore
30+
InAppMessagingDisplay
3031
3132
platform can be one of:
3233
iOS (default)
@@ -229,6 +230,30 @@ case "$product-$method-$platform" in
229230
fi
230231
;;
231232

233+
InAppMessagingDisplay-xcodebuild-iOS)
234+
# Run UI tests on both iPad and iphone simultors
235+
RunXcodebuild \
236+
-workspace 'InAppMessagingDisplay/Example/InAppMessagingDisplay-Sample.xcworkspace' \
237+
-scheme 'FiamDisplaySwiftExample' \
238+
"${xcb_flags[@]}" \
239+
-destination 'platform=iOS Simulator,name=iPad Air' \
240+
build \
241+
test
242+
243+
cd InAppMessagingDisplay/Example
244+
sed -i -e 's/use_frameworks/\#use_frameworks/' Podfile
245+
pod update --no-repo-update
246+
cd ../..
247+
# Run UI tests on both iPad and iphone simultors
248+
RunXcodebuild \
249+
-workspace 'InAppMessagingDisplay/Example/InAppMessagingDisplay-Sample.xcworkspace' \
250+
-scheme 'FiamDisplaySwiftExample' \
251+
"${xcb_flags[@]}" \
252+
-destination 'platform=iOS Simulator,name=iPad Air' \
253+
build \
254+
test
255+
;;
256+
232257
Firestore-xcodebuild-iOS)
233258
RunXcodebuild \
234259
-workspace 'Firestore/Example/Firestore.xcworkspace' \

‎scripts/if_changed.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ else
4949
check_changes '^(Firebase|Functions|GoogleUtilities|Example)'
5050
;;
5151

52+
InAppMessagingDisplay-*)
53+
check_changes '^(Firebase/InAppMessagingDisplay|InAppMessagingDisplay)'
54+
;;
55+
5256
Firestore-xcodebuild|Firestore-pod-lib-lint)
5357
check_changes '^Firestore'
5458
;;

‎scripts/install_prereqs.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ case "$PROJECT-$PLATFORM-$METHOD" in
2727
bundle exec pod install --project-directory=Example --repo-update
2828
bundle exec pod install --project-directory=Functions/Example
2929
bundle exec pod install --project-directory=GoogleUtilities/Example
30+
bundle exec pod install --project-directory=InAppMessagingDisplay/Example
3031

3132
# Set up GoogleService-Info.plist for Storage and Database integration tests. The decrypting
3233
# is not supported for pull requests. See https://docs.travis-ci.com/user/encrypting-files/
@@ -44,6 +45,11 @@ case "$PROJECT-$PLATFORM-$METHOD" in
4445
bundle exec pod install --project-directory=GoogleUtilities/Example
4546
;;
4647

48+
InAppMessagingDisplay-iOS-xcodebuild)
49+
gem install xcpretty
50+
bundle exec pod install --project-directory=InAppMessagingDisplay/Example --repo-update
51+
;;
52+
4753
Firestore-*-xcodebuild | Firestore-*-fuzz)
4854
gem install xcpretty
4955
bundle exec pod install --project-directory=Firestore/Example --repo-update

0 commit comments

Comments
 (0)