scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #2300 from MasterOfTheTiger/scratchjr-links

Browse source 
Use https for ScratchJR links
This commit is contained in:
Ray Schamp 2018-11-11 16:30:01 +00:00 committed by GitHub
commit e776e67af0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/footer/conference/2016/footer.jsx
View file

@ -80,7 +80,7 @@ const ConferenceFooter = () => (
<a href="https://scratch.mit.edu">Scratch</a>
</li>
<li>
<a href="http://www.scratchjr.org/">ScratchJr</a>
<a href="https://www.scratchjr.org/">ScratchJr</a>
</li>
</FlexRow>
<FlexRow

2
src/components/footer/conference/2017/footer.jsx
View file

@ -23,7 +23,7 @@ const ConferenceFooter = props => (
<a href="https://scratch.mit.edu">Scratch</a>
</li>
<li>
<a href="http://www.scratchjr.org/">ScratchJr</a>
<a href="https://www.scratchjr.org/">ScratchJr</a>
</li>
</FlexRow>
<FlexRow

2
src/components/footer/conference/2018/footer.jsx
View file

@ -99,7 +99,7 @@ const ConferenceFooter = props => (
</li>
<li>
<a
href="http://www.scratchjr.org/"
href="https://www.scratchjr.org/"
rel="noopener noreferrer"
target="_blank"
>

2
src/components/footer/www/footer.jsx
View file

@ -186,7 +186,7 @@ const Footer = props => (
</a>
</dd>
<dd>
<a href="http://www.scratchjr.org/">
<a href="https://www.scratchjr.org/">
<FormattedMessage id="general.scratchJr" />
</a>
</dd>

2
test/integration-cypress/cypress/smoke-tests/test-footer-links.js
View file

@ -262,7 +262,7 @@ describe('test Scratch Family links in footer', function () {
.click();
cy
.url()
.should('match', /^http:\/\/www\.scratchjr\.org\/?$/);
.should('match', /^https:\/\/www\.scratchjr\.org\/?$/);
});
it.skip('click Scratch Day', function (){

2
test/integration/smoke-testing/test_footer_links.js
View file

@ -269,7 +269,7 @@ tap.test('clickScratchEdLink', options, t => {
// SCRATCH JR (SCRATCHJR)
tap.test('clickScratchJrLink', options, t => {
const linkText = 'ScratchJr';
const expectedUrl = 'http://www.scratchjr.org/';
const expectedUrl = 'https://www.scratchjr.org/';
clickFooterLinks(linkText).then(url => {
t.equal(url, expectedUrl);
t.end();