Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: linkify tests #1064

Merged
merged 2 commits into from
Mar 7, 2022
Merged

fix: linkify tests #1064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1547e0
replace ipfs.git.sexy with wiki-on-ipfs
SgtPooki Feb 16, 2022
1e7cb86
chore: typo fix
SgtPooki Feb 16, 2022
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
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ See the [GitHub Flow Guide](https://guides.github.com/introduction/flow/) for de

Go to Transifex and join [IPFS Companion Translation Project](https://www.transifex.com/ipfs/ipfs-companion/) :sparkles:

If you want to downoad translations from Transifex and run them locally, make sure to read [Localization Notes](LOCALIZATION-NOTES.md) first.
If you want to download translations from Transifex and run them locally, make sure to read [Localization Notes](LOCALIZATION-NOTES.md) first.

## Writing Code

Expand Down
4 changes: 2 additions & 2 deletions test/data/linkify-demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ <h1> Should be linkified</h1>
<br>/ipfs/bafkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy
<br>ipfs://QmTAsnXoWmLZQEpvyZscrReFzqxP3pvULfGVgpJuayrp1w (cidv0b58)
<br>ipfs://bafkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy (cidv1b32)
<br>ipns://ipfs.git.sexy
<br>ipns://en.wikipedia-on-ipfs.org
<br>dweb:/ipfs/QmTAsnXoWmLZQEpvyZscrReFzqxP3pvULfGVgpJuayrp1w
<h1> Should NOT be linkified</h1>
<br>ipfs:/QmTAsnXoWmLZQEpvyZscrReFzqxP3pvULfGVgpJuayrp1w
<br>ipns:/ipfs.git.sexy
<br>ipns:/en.wikipedia-on-ipfs.org
<br>dweb://ipfs/QmTAsnXoWmLZQEpvyZscrReFzqxP3pvULfGVgpJuayrp1w
<br>
</p>
Expand Down
4 changes: 2 additions & 2 deletions test/functional/lib/dnslink.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ describe('dnslinkResolver', function () {

describe('convertToIpnsPath(url)', function () {
it('should return IPNS path', function () {
const url = new URL('http://ipfs.git.sexy/sketches/ipld_intro.html?a=b#c=d')
const url = new URL('http://en.wikipedia-on-ipfs.org/sketches/ipld_intro.html?a=b#c=d')
const dnslinkResolver = createDnslinkResolver(getExternalNodeState)
expect(dnslinkResolver.convertToIpnsPath(url))
.to.equal('/ipns/ipfs.git.sexy/sketches/ipld_intro.html?a=b#c=d')
.to.equal('/ipns/en.wikipedia-on-ipfs.org/sketches/ipld_intro.html?a=b#c=d')
})
})
})
Expand Down
12 changes: 6 additions & 6 deletions test/functional/lib/ipfs-request-gateway-redirect.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,13 @@ describe('modifyRequest.onBeforeRequest:', function () {
state.ipfsNodeType = 'external'
})
it('should be served from custom gateway if {path} points to a FQDN with existing dnslink', function () {
const request = url2request('https://google.com/ipns/ipfs.git.sexy/index.html?argTest#hashTest')
const request = url2request('https://google.com/ipns/en.wikipedia-on-ipfs.org/index.html?argTest#hashTest')
// stub the existence of valid dnslink
const fqdn = 'ipfs.git.sexy'
const fqdn = 'en.wikipedia-on-ipfs.org'
dnslinkResolver.readDnslinkFromTxtRecord = sinon.stub().withArgs(fqdn).returns('/ipfs/Qmazvovg6Sic3m9igZMKoAPjkiVZsvbWWc8ZvgjjK1qMss')
// pretend API is online and we can do dns lookups with it
state.peerCount = 1
expect(modifyRequest.onBeforeRequest(request).redirectUrl).to.equal('http://localhost:8080/ipns/ipfs.git.sexy/index.html?argTest#hashTest')
expect(modifyRequest.onBeforeRequest(request).redirectUrl).to.equal('http://localhost:8080/ipns/en.wikipedia-on-ipfs.org/index.html?argTest#hashTest')
})
it('should be served from custom gateway if {path} starts with a valid PeerID', function () {
const request = url2request('https://google.com/ipns/QmSWnBwMKZ28tcgMFdihD8XS7p6QzdRSGf71cCybaETSsU/index.html?argTest#hashTest')
Expand All @@ -229,13 +229,13 @@ describe('modifyRequest.onBeforeRequest:', function () {
state.ipfsNodeType = 'embedded'
})
it('should be served from public gateway if {path} points to a FQDN with existing dnslink', function () {
const request = url2request('https://google.com/ipns/ipfs.git.sexy/index.html?argTest#hashTest')
const request = url2request('https://google.com/ipns/en.wikipedia-on-ipfs.org/index.html?argTest#hashTest')
// stub the existence of valid dnslink
const fqdn = 'ipfs.git.sexy'
const fqdn = 'en.wikipedia-on-ipfs.org'
dnslinkResolver.readDnslinkFromTxtRecord = sinon.stub().withArgs(fqdn).returns('/ipfs/Qmazvovg6Sic3m9igZMKoAPjkiVZsvbWWc8ZvgjjK1qMss')
// pretend API is online and we can do dns lookups with it
state.peerCount = 1
expect(modifyRequest.onBeforeRequest(request).redirectUrl).to.equal('https://ipfs.io/ipns/ipfs.git.sexy/index.html?argTest#hashTest')
expect(modifyRequest.onBeforeRequest(request).redirectUrl).to.equal('https://ipfs.io/ipns/en.wikipedia-on-ipfs.org/index.html?argTest#hashTest')
})
it('should be served from public gateway if {path} starts with a valid PeerID', function () {
const request = url2request('https://google.com/ipns/QmSWnBwMKZ28tcgMFdihD8XS7p6QzdRSGf71cCybaETSsU/index.html?argTest#hashTest')
Expand Down