Skip to content

Commit

Permalink
Merge pull request #1192 from stripe/merge-master-into-beta
Browse files Browse the repository at this point in the history
Merge master into beta
  • Loading branch information
pakrym-stripe committed Mar 17, 2023
2 parents 105506a + 9d8ca62 commit 24f8480
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/ci.yml
Expand Up @@ -50,10 +50,9 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
- name: Start stripe-mock
run: docker run -d -p 12111-12112:12111-12112 stripe/stripe-mock && sleep 5
- uses: stripe/openapi/actions/stripe-mock@master
- name: test
run: bundle install && bundle exec rake test
run: make ci-test
env:
GITHUB_TOKEN: ${{ secrets.github_token }}
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
Expand Down Expand Up @@ -81,3 +80,7 @@ jobs:
run: gem push gems/*.gem
env:
GEM_HOST_API_KEY: ${{secrets.GEM_HOST_API_KEY}}
- uses: stripe/openapi/actions/notify-release@master
if: always()
with:
bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
7 changes: 6 additions & 1 deletion Makefile
@@ -1,8 +1,13 @@
.PHONY: update-version codegen-format
.PHONY: update-version codegen-format test ci-test
update-version:
@echo "$(VERSION)" > VERSION
@perl -pi -e 's|VERSION = "[.\-\w\d]+"|VERSION = "$(VERSION)"|' lib/stripe/version.rb

codegen-format:
bundle install --quiet
bundle exec rubocop -o /dev/null --auto-correct

ci-test:
bundle install && bundle exec rake test

test: ci-test
10 changes: 0 additions & 10 deletions test/stripe/source_test.rb
Expand Up @@ -78,16 +78,6 @@ class SourceTest < Test::Unit::TestCase
end
end

context ".retrieve_source_transaction" do
should "retrieve a source transaction" do
Stripe::Source.retrieve_source_transaction(
"src_123",
"srctxn_123"
)
assert_requested :get, "#{Stripe.api_base}/v1/sources/src_123/source_transactions/srctxn_123"
end
end

context ".list_source_transactions" do
should "list source transactions" do
Stripe::Source.list_source_transactions(
Expand Down

0 comments on commit 24f8480

Please sign in to comment.