Skip to content
Merged
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
29 changes: 13 additions & 16 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,22 +129,19 @@ jobs:

# Write any secrets, such as API keys, to the .env.testing file now.
- name: Define GitHub Secrets in .env.testing
uses: DamianReeves/write-file-action@v1.3
with:
path: ${{ env.PLUGIN_DIR }}/.env.testing
contents: |
CONVERTKIT_API_KEY=${{ env.CONVERTKIT_API_KEY }}
CONVERTKIT_API_SECRET=${{ env.CONVERTKIT_API_SECRET }}
CONVERTKIT_OAUTH_ACCESS_TOKEN=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN }}
CONVERTKIT_OAUTH_REFRESH_TOKEN=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN }}
CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA }}
CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA }}
CONVERTKIT_OAUTH_CLIENT_ID=${{ env.CONVERTKIT_OAUTH_CLIENT_ID }}
CONVERTKIT_OAUTH_REDIRECT_URI=${{ env.CONVERTKIT_OAUTH_REDIRECT_URI }}
CONVERTKIT_API_SIGNED_SUBSCRIBER_ID=${{ env.CONVERTKIT_API_SIGNED_SUBSCRIBER_ID }}
CONVERTKIT_API_SUBSCRIBER_TOKEN=${{ env.CONVERTKIT_API_SUBSCRIBER_TOKEN }}

write-mode: append
run: |
cat > ${{ env.PLUGIN_DIR }}/.env.testing << 'ENVEOF'
CONVERTKIT_API_KEY=${{ env.CONVERTKIT_API_KEY }}
CONVERTKIT_API_SECRET=${{ env.CONVERTKIT_API_SECRET }}
CONVERTKIT_OAUTH_ACCESS_TOKEN=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN }}
CONVERTKIT_OAUTH_REFRESH_TOKEN=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN }}
CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_ACCESS_TOKEN_NO_DATA }}
CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA=${{ env.CONVERTKIT_OAUTH_REFRESH_TOKEN_NO_DATA }}
CONVERTKIT_OAUTH_CLIENT_ID=${{ env.CONVERTKIT_OAUTH_CLIENT_ID }}
CONVERTKIT_OAUTH_REDIRECT_URI=${{ env.CONVERTKIT_OAUTH_REDIRECT_URI }}
CONVERTKIT_API_SIGNED_SUBSCRIBER_ID=${{ env.CONVERTKIT_API_SIGNED_SUBSCRIBER_ID }}
CONVERTKIT_API_SUBSCRIBER_TOKEN=${{ env.CONVERTKIT_API_SUBSCRIBER_TOKEN }}
ENVEOF

# Installs wp-browser, Codeception, PHP CodeSniffer and anything else needed to run tests.
- name: Run Composer
Expand Down
12 changes: 9 additions & 3 deletions tests/Integration/APITest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3924,7 +3924,7 @@ public function testCreateSubscriberWithInvalidSubscriberState()
}

/**
* Test that create_subscriber() returns a WP_Error
* Test that create_subscriber() returns the expected data
* when an invalid custom field is included.
*
* @since 2.0.0
Expand All @@ -3940,8 +3940,14 @@ public function testCreateSubscriberWithInvalidCustomFields()
'not_a_custom_field' => 'value',
]
);
$this->assertInstanceOf(\WP_Error::class, $result);
$this->assertEquals($result->get_error_code(), $this->errorCode);
$this->assertNotInstanceOf(\WP_Error::class, $result);
$this->assertIsArray($result);

// Set subscriber_id to ensure subscriber is unsubscribed after test.
$this->subscriber_ids[] = $result['subscriber']['id'];

// Assert subscriber exists with correct data.
$this->assertEquals($result['subscriber']['email_address'], $emailAddress);
}

/**
Expand Down