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

Fix for including the builds after build 1258 #670

Merged
merged 4 commits into from
Feb 1, 2024
+53 −2
Merged

Fix for including the builds after build 1258 #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30630a6
Update regex filter pattern to match href with Pharo-12 optionally fo…
Jan 31, 2024
f736665
test new regex for Pharo 12
demarey Feb 1, 2024
b1ccb0f
Merge pull request #1 from pharo-project/enh/pr-670
hernanmd Feb 1, 2024
7e47b2f
Update sources.list
hernanmd Feb 1, 2024
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 sources.list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ OrderedCollection [
#type : #HttpListing,
#name : 'Pharo 12.0 (development version)',
#url : 'https://files.pharo.org/image/120/',
#filterPattern : 'href="(Pharo-?12-SNAPSHOT.build.[^"]*.zip)"'
#filterPattern : 'href="(Pharo-?12(.[0-9]+)?-SNAPSHOT.build.[^"]*.zip)"'
},
PhLTemplateSource {
#type : #HttpListing,
Expand Down
53 changes: 52 additions & 1 deletion src/PharoLauncher-Tests-Functional/PhLHTTPListingTemplateGroupTest.class.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,61 @@ PhLHTTPListingTemplateGroupTest >> newGroup [
^ PhLHTTPListingTemplateGroup name: 'Test' url: self exampleUrl
]

{ #category : #'instance creation' }
PhLHTTPListingTemplateGroupTest >> newPharo12Group [

^ PhLHTTPListingTemplateGroup
name: 'TestPharo12'
url: self pharo12ExampleUrl
filterPattern: 'href="(Pharo-?12(.[0-9]+)?-SNAPSHOT.build.[^"]*.zip)"'
]

{ #category : #helpers }
PhLHTTPListingTemplateGroupTest >> pharo12ExampleContent [
^ '<!DOCTYPE html><!--[if lt IE 9]><html class="no-js oldie" lang="en"><![endif]--><!--[if gt IE 8]><!--><html class="no-js" lang="en"><!--<![endif]--><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><title>index · styled with h5ai 0.22.1 (http://larsjung.de/h5ai/)</title><meta name="description" content="index styled with h5ai 0.22.1 (http://larsjung.de/h5ai/)"><meta name="viewport" content="width=device-width"><link rel="shortcut icon" href="/_h5ai/client/images/app-16x16.ico"><link rel="apple-touch-icon" type="image/png" href="/_h5ai/client/images/app-48x48.png"><link rel="stylesheet" href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:400,700,400italic,700italic"><link rel="stylesheet" href="/_h5ai/client/css/styles.css"><script src="/_h5ai/client/js/scripts.js" data-mode="aai"></script></head><body id="h5ai-main"><div id="topbar" class="clearfix"><ul id="navbar"></ul></div><div id="content"><div id="extended" class="clearfix"></div></div><div id="bottombar" class="clearfix"><span class="left"><a id="h5ai-reference" href="http://larsjung.de/h5ai/" title="h5ai · a modern HTTP web server index">h5ai 0.22.1</a><span class="hideOnJs noJsMsg">⚡ JavaScript is disabled! ⚡</span><span class="oldBrowser">⚡ Some features disabled! Works best in <a href="http://browsehappy.com">modern browsers</a>. ⚡</span></span><span class="right"></span><span class="center"></span></div><div id="data-apache-autoindex" class="hideOnJs"><!-- The following code was generated by Apache''s autoindex module.-->
<table>
<tr><th valign="top"><img src="/__ovh_icons/blank.gif" alt="[ICO]" /></th><th><a href="?C=N;O=A">Name</a></th><th><a href="?C=M;O=A">Last modified</a></th><th><a href="?C=S;O=A">Size</a></th></tr>
<tr><td valign="top"><img src="/__ovh_icons/back.gif" alt="[PARENTDIR]" /></td><td><a href="/image/">Parent Directory</a></td><td>&nbsp;</td><td align="right"> - </td></tr>
<tr><td valign="top"><img src="/__ovh_icons/compressed.gif" alt="[ ]" /></td><td><a href="stable-64.zip">stable-64.zip</a></td><td align="right">2024-01-30 10:44 </td><td align="right"> 23M</td></tr>
<tr><td valign="top"><img src="/__ovh_icons/compressed.gif" alt="[ ]" /></td><td><a href="latest-minimal-64.zip">latest-minimal-64.zip</a></td><td align="right">2024-01-30 10:44 </td><td align="right">3.0M</td></tr>
<tr><td valign="top"><img src="/__ovh_icons/compressed.gif" alt="[ ]" /></td><td><a href="latest-64.zip">latest-64.zip</a></td><td align="right">2024-01-30 10:44 </td><td align="right"> 23M</td></tr>
<tr><td valign="top"><img src="/__ovh_icons/compressed.gif" alt="[ ]" /></td><td><a href="Pharo1212.0-SNAPSHOT.build.1256.sha.7a6c05e.arch.64bit.zip">Pharo1212.0-SNAPSHOT.build.1256.sha.7a6c05e.arch.64bit.zip</a></td><td align="right">2023-12-28 22:22 </td><td align="right"> 15M</td></tr>
<tr><td valign="top"><img src="/__ovh_icons/compressed.gif" alt="[ ]" /></td><td><a href="Pharo1212.0-SNAPSHOT-metacello.build.1256.sha.7a6c05e.arch.64bit.zip">Pharo1212.0-SNAPSHOT-metacello.build.1256.sha.7a6c05e.arch.64bit.zip</a></td><td align="right">2023-12-28 22:22 </td><td align="right">3.0M</td></tr>
<tr><td valign="top"><img src="/__ovh_icons/compressed.gif" alt="[ ]" /></td><td><a href="Pharo12.0-SNAPSHOT.build.1329.sha.25a911c.arch.64bit.zip">Pharo12.0-SNAPSHOT.build.1329.sha.25a911c.arch.64bit.zip</a></td><td align="right">2024-01-30 10:44 </td><td align="right"> 23M</td></tr>
<tr><td valign="top"><img src="/__ovh_icons/compressed.gif" alt="[ ]" /></td><td><a href="Pharo12.0-SNAPSHOT.build.1328.sha.10f5de5.arch.64bit.zip">Pharo12.0-SNAPSHOT.build.1328.sha.10f5de5.arch.64bit.zip</a></td><td align="right">2024-01-29 21:41 </td><td align="right"> 23M</td></tr>
<tr><td valign="top"><img src="/__ovh_icons/compressed.gif" alt="[ ]" /></td><td><a href="Pharo12-SNAPSHOT.build.1229.sha.ed99075.arch.64bit.zip">Pharo12-SNAPSHOT.build.1229.sha.ed99075.arch.64bit.zip</a></td><td align="right">2023-12-17 22:22 </td><td align="right"> 21M</td></tr>
<tr><td valign="top"><img src="/__ovh_icons/compressed.gif" alt="[ ]" /></td><td><a href="Pharo12-SNAPSHOT.build.1228.sha.826d9bb.arch.64bit.zip">Pharo12-SNAPSHOT.build.1228.sha.826d9bb.arch.64bit.zip</a></td><td align="right">2023-12-16 18:34 </td><td align="right"> 21M</td></tr>
<tr><td valign="top"><img src="/__ovh_icons/compressed.gif" alt="[ ]" /></td><td><a href="Pharo12-SNAPSHOT-metacello.build.4.sha.cb2a5dd.arch.64bit.zip">Pharo12-SNAPSHOT-metacello.build.4.sha.cb2a5dd.arch.64bit.zip</a></td><td align="right">2023-03-15 20:28 </td><td align="right">4.0M</td></tr>
</table>
<!-- generated code ends here--></div></body></html>'
]

{ #category : #helpers }
PhLHTTPListingTemplateGroupTest >> pharo12ExampleUrl [
^ 'https://files.pharo.org/image/120/' asZnUrl
]

{ #category : #running }
PhLHTTPListingTemplateGroupTest >> setUp [
super setUp.
self downloadManager atUrl: self exampleUrl answer: self exampleContent
self downloadManager atUrl: self exampleUrl answer: self exampleContent.
self downloadManager atUrl: self pharo12ExampleUrl answer: self pharo12ExampleContent
]

{ #category : #tests }
PhLHTTPListingTemplateGroupTest >> testCanMatchPharo12Templates [
| group templatesAndGroups |
group := self newPharo12Group.

templatesAndGroups := group templatesAndGroups.

self assert: (templatesAndGroups noneSatisfy: [ :template | template isTemplateGroup ]).
self
assertCollection: (templatesAndGroups collect: #name)
hasSameElements: #('Pharo12.0-SNAPSHOT.build.1329.sha.25a911c.arch.64bit'
'Pharo12.0-SNAPSHOT.build.1328.sha.10f5de5.arch.64bit'
'Pharo12-SNAPSHOT.build.1229.sha.ed99075.arch.64bit'
'Pharo12-SNAPSHOT.build.1228.sha.826d9bb.arch.64bit')
]

{ #category : #tests }
Expand Down
Loading