Skip to content

Commit d4041a8

Browse files
DominikAlberskiDominikAlberski
authored
Release_2025-07-28
Release 2025 07 28
2 parents 28c8418 + 3ff498e commit d4041a8

File tree

9 files changed

+81
-21
lines changed

9 files changed

+81
-21
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: ruby
22
group: edge
33
rvm:
4-
- 3.2
4+
- 3.2.5
55

66
services:
77
- redis-server

‎lib/travis/addons/billing/mailer/views/billing_mailer/charge_failed.html.erb‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161

162162
<body style="min-width: 100%;height: 100%;margin: 0;padding: 0;font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
163163

164-
<table id="travis-ci-email-container" align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" style="height: 100%;width: 100%;padding: 30px;font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;text-align: center;color: #333333;line-height: 1.4;background-color: #f6f7fa;background-image: url(#{Travis.config.s3.url}/billing-background.png);background-size: 600px 600px;">
164+
<table id="travis-ci-email-container" align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" style="height: 100%;width: 100%;padding: 30px;font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;text-align: center;color: #333333;line-height: 1.4;">
165165
<!-- Main Content Section -->
166166
<tr>
167167
<td align="center" valign="top" style="font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
@@ -172,7 +172,8 @@
172172
<!-- Logo -->
173173
<tr>
174174
<td id="travis-logo-img-container" style="font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;border-bottom: 2px solid #e5e7e9;padding-bottom: 4.545%;">
175-
<img src="#{Travis.config.s3.url}/travis_ci_logo.png" alt="Travis CI Logo" id="travis-logo-img" style="width: 42%;">
175+
<%= image_tag("#{Travis.config.s3.url}/travis_ci_logo.png", style: 'width: 42%', id: 'travis-logo-img', alt: 'Travis CI Logo') %>
176+
176177
</td>
177178
</tr>
178179
<!-- Header - Payment failed -->
@@ -227,8 +228,8 @@
227228
</tr>
228229
<tr>
229230
<td id="travis-ci-twitter-section" style="font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;text-align: center;">
230-
<a href="http://www.twitter.com/travisci" style="display: inline-block;height: 32px;vertical-align: bottom;">
231-
<img id="travis-ci-twitter-logo" src="#{Travis.config.s3.url}/twitter2x.png" alt="Twitter Logo" style="width: 32px;height: 32px;">
231+
<a href="http://x.com/travisci" style="display: inline-block;height: 32px;vertical-align: bottom;">
232+
<%= image_tag("#{Travis.config.s3.url}/x-logo-black.png", style: 'width: 32px;height:32px;', id: 'travis-ci-twitter-logo', alt: 'X Logo') %>
232233
</a>
233234
</td>
234235
</tr>

‎lib/travis/addons/billing/mailer/views/billing_mailer/subscription_cancellation_requested.html.erb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
color: #333333;
2727
line-height: 1.4;
2828
background-color: #F4F5F9;
29-
background-image: url("#{Travis.config.s3.url}/billing-background.png");
29+
background-image: <%= "url(#{Travis.config.s3.url}/billing-background.png)" %>;
3030
background-size: 600px 600px;
3131
}
3232

@@ -125,7 +125,7 @@
125125

126126
<body class="not-wide" style="min-width: 100%;height: 100%;margin: 0;padding: 0;font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
127127

128-
<table id="travis-ci-email-container" align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" style="height: 100%;width: 100%;padding: 30px;font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;text-align: center;color: #333333;line-height: 1.4;background-color: #F4F5F9;background-image: url(#{Travis.config.s3.url}/billing-background.png);background-size: 600px 600px;">
128+
<table id="travis-ci-email-container" align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" style="height: 100%;width: 100%;padding: 30px;font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;text-align: center;color: #333333;line-height: 1.4;">
129129
<!-- Main Content Section -->
130130
<tr>
131131
<td align="center" valign="top" style="font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;">
@@ -164,11 +164,11 @@
164164
</tr>
165165
<tr>
166166
<td id="travis-ci-twitter-section" style="font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;text-align: center;">
167-
<a href="http://www.twitter.com/travisci" style="display: inline-block;height: 32px;vertical-align: bottom;">
167+
<a href="http://x.com/travisci" style="display: inline-block;height: 32px;vertical-align: bottom;">
168168
<img
169169
id="travis-ci-twitter-logo"
170-
src="https://ci6.googleusercontent.com/proxy/u_GkY0vPn3zh6k_Iocra5_P1V00M-TFRNu-P7gPciI_J5CkDABrV1urf2QfoLPirfH6tojEO6P2xe9jKJeBggB6N-SRbbfN1ecrcfw=s0-d-e1-ft#https://s3.amazonaws.com/travis-ci-dzone/twitter2x.png"
171-
alt="Twitter Logo"
170+
src="https://s3.amazonaws.com/travis-email-assets/x-logo-black.png"
171+
alt="X Logo"
172172
style="width: 32px;height: 32px;">
173173
</a>
174174
</td>

‎lib/travis/addons/billing/mailer/views/billing_mailer/subscription_cancelled.html.erb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@
168168
</tr>
169169
<tr>
170170
<td id="travis-ci-twitter-section" style="font-family: 'Source Sans Pro', 'Helvetica Neue', Helvetica, Arial, sans-serif;text-align: center;">
171-
<a href="http://www.twitter.com/travisci" style="display: inline-block;height: 32px;vertical-align: bottom;">
172-
<img id="travis-ci-twitter-logo" src="#{Travis.config.s3.url}/twitter2x.png" alt="Twitter Logo" style="width: 32px;height: 32px;">
171+
<a href="http://x.com/travisci" style="display: inline-block;height: 32px;vertical-align: bottom;">
172+
<%= image_tag("#{Travis.config.s3.url}/x-logo-black.png", style: 'width: 32px;height:32px;', id: 'travis-ci-twitter-logo', alt: 'X Logo') %>
173173
</a>
174174
</td>
175175
</tr>

‎lib/travis/addons/plan/mailer/views/layouts/contact_email.html.erb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,11 +250,11 @@
250250
<% end %>
251251
<tr>
252252
<td id="travis-ci-twitter-section" style="text-align: center; padding-bottom: 20px;">
253-
<a href="http://www.twitter.com/travisci">
253+
<a href="https://x.com/travisci">
254254
<img
255255
id="travis-ci-twitter-logo"
256-
src="https://ci6.googleusercontent.com/proxy/u_GkY0vPn3zh6k_Iocra5_P1V00M-TFRNu-P7gPciI_J5CkDABrV1urf2QfoLPirfH6tojEO6P2xe9jKJeBggB6N-SRbbfN1ecrcfw=s0-d-e1-ft#https://s3.amazonaws.com/travis-ci-dzone/twitter2x.png"
257-
alt="Twitter Logo"
256+
src="https://s3.amazonaws.com/travis-email-assets/x-logo-black.png"
257+
alt="X Logo"
258258
style="text-align: center;">
259259
</a>
260260
</td>

‎lib/travis/addons/trial/mailer/views/layouts/contact_email.html.erb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,11 @@
261261
</tr>
262262
<tr>
263263
<td id="travis-ci-twitter-section" style="text-align: center; padding-bottom: 20px;">
264-
<a href="http://www.twitter.com/travisci">
264+
<a href="https://x.com/travisci">
265265
<img
266266
id="travis-ci-twitter-logo"
267-
src="https://ci6.googleusercontent.com/proxy/u_GkY0vPn3zh6k_Iocra5_P1V00M-TFRNu-P7gPciI_J5CkDABrV1urf2QfoLPirfH6tojEO6P2xe9jKJeBggB6N-SRbbfN1ecrcfw=s0-d-e1-ft#https://s3.amazonaws.com/travis-ci-dzone/twitter2x.png"
268-
alt="Twitter Logo"
267+
src="https://s3.amazonaws.com/travis-email-assets/x-logo-black.png"
268+
alt="X Logo"
269269
style="text-align: center;">
270270
</a>
271271
</td>

‎lib/travis/addons/user_confirmation/mailer/views/layouts/contact_email.html.erb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,11 @@
253253
</tr>
254254
<tr>
255255
<td id="travis-ci-twitter-section" style="text-align: center; padding-bottom: 20px;">
256-
<a href="http://www.twitter.com/travisci">
256+
<a href="https://x.com/travisci">
257257
<img
258258
id="travis-ci-twitter-logo"
259-
src="https://ci6.googleusercontent.com/proxy/u_GkY0vPn3zh6k_Iocra5_P1V00M-TFRNu-P7gPciI_J5CkDABrV1urf2QfoLPirfH6tojEO6P2xe9jKJeBggB6N-SRbbfN1ecrcfw=s0-d-e1-ft#https://s3.amazonaws.com/travis-ci-dzone/twitter2x.png"
260-
alt="Twitter Logo"
259+
src="https://s3.amazonaws.com/travis-email-assets/x-logo-black.png"
260+
alt="X Logo"
261261
style="text-align: center;">
262262
</a>
263263
</td>

‎spec/addons/billing/mailer/charge_failed_spec.rb‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
require 'spec_helper'
2+
3+
describe Travis::Addons::Billing::Mailer::BillingMailer do
4+
describe '#charge_failed' do
5+
subject(:mail) { described_class.charge_failed([recipient], subscription, owner, charge, event, invoice, cc_last_digits) }
6+
7+
let(:recipient) { 'sergio@travis-ci.com' }
8+
let(:subscription) {{company: 'Ruby Monsters', first_name: 'Tessa', last_name: 'Schmidt', address: 'Rigaer Str.', city: 'Berlin', state: 'Berlin', post_code: '10000', country: 'Germany', vat_id: 'DE123456789'}}
9+
let(:owner) {{name: 'Ruby Monsters', login: 'rubymonsters', vcs_type: 'GithubUser', owner_type: 'User'}}
10+
let(:invoice) {{ pdf_url: pdf_url, amount_due: 999, current_period_start: Time.now.to_i, current_period_end: Time.now.to_i, amount: 999, created_at: Time.now.to_s, invoice_id: 'TP123', plan: 'Startup'}}
11+
let(:real_pdf_url) { 'http://invoices.travis-ci.dev/invoices/123'}
12+
let(:pdf_url) { real_pdf_url }
13+
let(:filename) { 'TP123.pdf' }
14+
let(:cc_last_digits) { '1234' }
15+
let(:charge) { nil}
16+
let(:event) { {}}
17+
18+
let(:html) { mail.body.raw_source }
19+
20+
before do
21+
stub_request(:get, real_pdf_url).to_return(status: 200, body: "% PDF", headers: {'Content-Disposition' => "attachment; filename=\"#{filename}\""})
22+
end
23+
24+
it 'is contains proper image urls' do
25+
expect(html).to include('https://s3.amazonaws.com/travis-email-assets/travis_ci_logo.png')
26+
expect(html).to include('https://s3.amazonaws.com/travis-email-assets/x-logo-black.png')
27+
end
28+
29+
end
30+
end

‎spec/addons/billing/mailer/subscription_cancellation_requested_spec.rb‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
require 'spec_helper'
2+
3+
describe Travis::Addons::Billing::Mailer::BillingMailer do
4+
describe '#charge_failed' do
5+
subject(:mail) { described_class.subscription_cancellation_requested([recipient], subscription, owner, charge, event, invoice, cc_last_digits) }
6+
7+
let(:recipient) { 'sergio@travis-ci.com' }
8+
let(:subscription) {{company: 'Ruby Monsters', first_name: 'Tessa', last_name: 'Schmidt', address: 'Rigaer Str.', city: 'Berlin', state: 'Berlin', post_code: '10000', country: 'Germany', vat_id: 'DE123456789'}}
9+
let(:owner) {{name: 'Ruby Monsters', login: 'rubymonsters', vcs_type: 'GithubUser', owner_type: 'User'}}
10+
let(:invoice) {{ pdf_url: pdf_url, amount_due: 999, current_period_start: Time.now.to_i, current_period_end: Time.now.to_i, amount: 999, created_at: Time.now.to_s, invoice_id: 'TP123', plan: 'Startup'}}
11+
let(:real_pdf_url) { 'http://invoices.travis-ci.dev/invoices/123'}
12+
let(:pdf_url) { real_pdf_url }
13+
let(:filename) { 'TP123.pdf' }
14+
let(:cc_last_digits) { '1234' }
15+
let(:charge) { nil}
16+
let(:event) { {}}
17+
18+
let(:html) { mail.body.raw_source }
19+
20+
before do
21+
stub_request(:get, real_pdf_url).to_return(status: 200, body: "% PDF", headers: {'Content-Disposition' => "attachment; filename=\"#{filename}\""})
22+
end
23+
24+
it 'is contains proper image urls' do
25+
expect(html).to include('https://s3.amazonaws.com/travis-email-assets/billing-background.png')
26+
end
27+
28+
end
29+
end

0 commit comments

Comments
 (0)