Skip to content
Merged
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
3 changes: 1 addition & 2 deletions integration_test/functions/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ export const integrationTests: any = functions
.collection('tests')
.doc(testId)
.set({ test: testId }),
// Invoke a callable HTTPS trigger.
callHttpsTrigger('callableTests', { foo: 'bar', testId }, baseUrl),
// A Remote Config update to trigger the Remote Config tests.
// admin.credential
Expand All @@ -150,8 +151,6 @@ export const integrationTests: any = functions
.storage()
.bucket()
.upload('/tmp/' + testId + '.txt'),
// Invoke a callable HTTPS trigger.
callHttpsTrigger('callableTests', { foo: 'bar', testId }),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was this call just not needed? Trying to understand why it was removed and not modified to include three fields.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We only need to invoke this once, which we do earlier in the file. I think this was the result of bad merge conflict resolution by git.

It looks like when the merge between public and private happened, this line was moved in one branch and modified to the new signature in the other, so git left both changes in the merge.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm...that sounds odd that this happened. Also we should always run the integration tests prior to releasing to avoid this in the future.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, this one is on me - i ran them before the merge and must have forgotten to rerun afterwards

// Invoke the schedule for our scheduled function to fire
callScheduleTrigger('schedule', 'us-central1'),
])
Expand Down