mirror of
https://github.com/photoprism/photoprism.git
synced 2026-01-23 02:24:24 +00:00
Tests: Adapt fixtures to have valid slugs
This commit is contained in:
graciousgrey
parent
e3e034cc68
commit
597593f4ee
8 changed files with 120 additions and 120 deletions
|
|
@ -42,13 +42,13 @@ func TestCachedAlbumByUID(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
} else {
|
||||
assert.Equal(t, "as6sg6bipotaab23", result.AlbumUID)
|
||||
assert.Equal(t, "pest&dogs", result.AlbumSlug)
|
||||
assert.Equal(t, "pets-and-dogs", result.AlbumSlug)
|
||||
}
|
||||
if cached, err := CachedAlbumByUID("as6sg6bipotaab23"); err != nil {
|
||||
t.Fatal(err)
|
||||
} else {
|
||||
assert.Equal(t, "as6sg6bipotaab23", cached.AlbumUID)
|
||||
assert.Equal(t, "pest&dogs", cached.AlbumSlug)
|
||||
assert.Equal(t, "pets-and-dogs", cached.AlbumSlug)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -296,10 +296,10 @@ var AlbumFixtures = AlbumMap{
|
|||
"&ilikefood": {
|
||||
ID: 1000011,
|
||||
AlbumUID: "as6sg6bipotaab19",
|
||||
AlbumSlug: "&ilikefood",
|
||||
AlbumSlug: "ilikefood",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "&IlikeFood",
|
||||
AlbumTitle: "IlikeFood",
|
||||
AlbumLocation: "",
|
||||
AlbumCategory: "",
|
||||
AlbumCaption: "",
|
||||
|
|
@ -321,7 +321,7 @@ var AlbumFixtures = AlbumMap{
|
|||
"i-love-%-dog": {
|
||||
ID: 1000012,
|
||||
AlbumUID: "as6sg6bipotaab20",
|
||||
AlbumSlug: "i-love-%-dog",
|
||||
AlbumSlug: "i-love-dog",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "I love % dog",
|
||||
|
|
@ -346,7 +346,7 @@ var AlbumFixtures = AlbumMap{
|
|||
"%gold": {
|
||||
ID: 1000013,
|
||||
AlbumUID: "as6sg6bipotaab21",
|
||||
AlbumSlug: "%gold",
|
||||
AlbumSlug: "gold",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "%gold",
|
||||
|
|
@ -371,7 +371,7 @@ var AlbumFixtures = AlbumMap{
|
|||
"sale%": {
|
||||
ID: 1000014,
|
||||
AlbumUID: "as6sg6bipotaab22",
|
||||
AlbumSlug: "sale%",
|
||||
AlbumSlug: "sale",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "sale%",
|
||||
|
|
@ -396,7 +396,7 @@ var AlbumFixtures = AlbumMap{
|
|||
"pets&dogs": {
|
||||
ID: 1000015,
|
||||
AlbumUID: "as6sg6bipotaab23",
|
||||
AlbumSlug: "pest&dogs",
|
||||
AlbumSlug: "pets-and-dogs",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "Pets & Dogs",
|
||||
|
|
@ -421,10 +421,10 @@ var AlbumFixtures = AlbumMap{
|
|||
"light&": {
|
||||
ID: 1000016,
|
||||
AlbumUID: "as6sg6bipotaab24",
|
||||
AlbumSlug: "light&",
|
||||
AlbumSlug: "light",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "Light&",
|
||||
AlbumTitle: "Light",
|
||||
AlbumLocation: "",
|
||||
AlbumCategory: "",
|
||||
AlbumCaption: "",
|
||||
|
|
@ -446,7 +446,7 @@ var AlbumFixtures = AlbumMap{
|
|||
"'family": {
|
||||
ID: 1000017,
|
||||
AlbumUID: "as6sg6bipotaab25",
|
||||
AlbumSlug: "'family",
|
||||
AlbumSlug: "family",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "'Family",
|
||||
|
|
@ -471,7 +471,7 @@ var AlbumFixtures = AlbumMap{
|
|||
"father's-day": {
|
||||
ID: 1000018,
|
||||
AlbumUID: "as6sg6bipotaab26",
|
||||
AlbumSlug: "father's-day",
|
||||
AlbumSlug: "fathers-day",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "Father's Day",
|
||||
|
|
@ -496,7 +496,7 @@ var AlbumFixtures = AlbumMap{
|
|||
"ice-cream'": {
|
||||
ID: 1000019,
|
||||
AlbumUID: "as6sg6bipotaab27",
|
||||
AlbumSlug: "ice-cream'",
|
||||
AlbumSlug: "ice-cream",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "Ice Cream'",
|
||||
|
|
@ -521,7 +521,7 @@ var AlbumFixtures = AlbumMap{
|
|||
"*forrest": {
|
||||
ID: 1000020,
|
||||
AlbumUID: "as6sg6bipotaab28",
|
||||
AlbumSlug: "*forrest",
|
||||
AlbumSlug: "forrest",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "*Forrest",
|
||||
|
|
@ -546,7 +546,7 @@ var AlbumFixtures = AlbumMap{
|
|||
"my*kids": {
|
||||
ID: 1000021,
|
||||
AlbumUID: "as6sg6bipotaab29",
|
||||
AlbumSlug: "my*kids",
|
||||
AlbumSlug: "my-kids",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "My*Kids",
|
||||
|
|
@ -571,7 +571,7 @@ var AlbumFixtures = AlbumMap{
|
|||
"yoga***": {
|
||||
ID: 1000022,
|
||||
AlbumUID: "as6sg6bipotaab30",
|
||||
AlbumSlug: "yoga***",
|
||||
AlbumSlug: "yoga",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "Yoga***",
|
||||
|
|
@ -596,10 +596,10 @@ var AlbumFixtures = AlbumMap{
|
|||
"|banana": {
|
||||
ID: 1000023,
|
||||
AlbumUID: "as6sg6bipotaab31",
|
||||
AlbumSlug: "|banana",
|
||||
AlbumSlug: "banana",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "|Banana",
|
||||
AlbumTitle: "Banana",
|
||||
AlbumLocation: "",
|
||||
AlbumCategory: "",
|
||||
AlbumCaption: "",
|
||||
|
|
@ -621,10 +621,10 @@ var AlbumFixtures = AlbumMap{
|
|||
"blue|": {
|
||||
ID: 1000024,
|
||||
AlbumUID: "as6sg6bipotaab33",
|
||||
AlbumSlug: "blue|",
|
||||
AlbumSlug: "blue",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "Blue|",
|
||||
AlbumTitle: "Blue",
|
||||
AlbumLocation: "",
|
||||
AlbumCategory: "",
|
||||
AlbumCaption: "",
|
||||
|
|
@ -671,7 +671,7 @@ var AlbumFixtures = AlbumMap{
|
|||
"color-555-blue": {
|
||||
ID: 1000026,
|
||||
AlbumUID: "as6sg6bipotaab35",
|
||||
AlbumSlug: "color-555-blue",
|
||||
AlbumSlug: "color555-blue",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "Color555 Blue",
|
||||
|
|
@ -721,7 +721,7 @@ var AlbumFixtures = AlbumMap{
|
|||
"red|green": {
|
||||
ID: 1000028,
|
||||
AlbumUID: "as6sg6bipotaab32",
|
||||
AlbumSlug: "red|green",
|
||||
AlbumSlug: "red-green",
|
||||
AlbumPath: "",
|
||||
AlbumType: AlbumManual,
|
||||
AlbumTitle: "Red|Green",
|
||||
|
|
|
|||
|
|
@ -218,9 +218,9 @@ var LabelFixtures = LabelMap{
|
|||
"%tennis": {
|
||||
ID: 1000011,
|
||||
LabelUID: "ls6sg6b1wowuy313",
|
||||
LabelSlug: "%tennis",
|
||||
CustomSlug: "%tennis",
|
||||
LabelName: "%tennis",
|
||||
LabelSlug: "tennis",
|
||||
CustomSlug: "tennis",
|
||||
LabelName: "tennis",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
LabelDescription: "",
|
||||
|
|
@ -235,8 +235,8 @@ var LabelFixtures = LabelMap{
|
|||
"chem%stry": {
|
||||
ID: 1000012,
|
||||
LabelUID: "ls6sg6b1wowuy314",
|
||||
LabelSlug: "chem%stry",
|
||||
CustomSlug: "chem%stry",
|
||||
LabelSlug: "chem-stry",
|
||||
CustomSlug: "chem-stry",
|
||||
LabelName: "chem%stry",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -252,8 +252,8 @@ var LabelFixtures = LabelMap{
|
|||
"cell%": {
|
||||
ID: 1000013,
|
||||
LabelUID: "ls6sg6b1wowuy315",
|
||||
LabelSlug: "cell%",
|
||||
CustomSlug: "cell%",
|
||||
LabelSlug: "cell",
|
||||
CustomSlug: "cell",
|
||||
LabelName: "cell%",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -269,8 +269,8 @@ var LabelFixtures = LabelMap{
|
|||
"&friendship": {
|
||||
ID: 1000014,
|
||||
LabelUID: "ls6sg6b1wowuy316",
|
||||
LabelSlug: "&friendship",
|
||||
CustomSlug: "&friendship",
|
||||
LabelSlug: "andfriendship",
|
||||
CustomSlug: "andfriendship",
|
||||
LabelName: "&friendship",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -286,8 +286,8 @@ var LabelFixtures = LabelMap{
|
|||
"construction&failure": {
|
||||
ID: 1000015,
|
||||
LabelUID: "ls6sg6b1wowuy317",
|
||||
LabelSlug: "construction&failure",
|
||||
CustomSlug: "construction&failure",
|
||||
LabelSlug: "constructionandfailure",
|
||||
CustomSlug: "constructionandfailure",
|
||||
LabelName: "construction&failure",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -303,8 +303,8 @@ var LabelFixtures = LabelMap{
|
|||
"goal&": {
|
||||
ID: 1000016,
|
||||
LabelUID: "ls6sg6b1wowuy318",
|
||||
LabelSlug: "goal&",
|
||||
CustomSlug: "goal&",
|
||||
LabelSlug: "goaland",
|
||||
CustomSlug: "goaland",
|
||||
LabelName: "goal&",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -320,8 +320,8 @@ var LabelFixtures = LabelMap{
|
|||
"'activity": {
|
||||
ID: 1000017,
|
||||
LabelUID: "ls6sg6b1wowuy319",
|
||||
LabelSlug: "'activity",
|
||||
CustomSlug: "'activity",
|
||||
LabelSlug: "activity",
|
||||
CustomSlug: "activity",
|
||||
LabelName: "'activity",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -337,8 +337,8 @@ var LabelFixtures = LabelMap{
|
|||
"funera'l": {
|
||||
ID: 1000018,
|
||||
LabelUID: "ls6sg6b1wowuy320",
|
||||
LabelSlug: "funera'l",
|
||||
CustomSlug: "funera'l",
|
||||
LabelSlug: "funeral",
|
||||
CustomSlug: "funeral",
|
||||
LabelName: "funera'l",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -354,8 +354,8 @@ var LabelFixtures = LabelMap{
|
|||
"technology'": {
|
||||
ID: 1000019,
|
||||
LabelUID: "ls6sg6b1wowuy321",
|
||||
LabelSlug: "technology'",
|
||||
CustomSlug: "technology'",
|
||||
LabelSlug: "technology",
|
||||
CustomSlug: "technology",
|
||||
LabelName: "technology'",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -371,8 +371,8 @@ var LabelFixtures = LabelMap{
|
|||
"*tea": {
|
||||
ID: 1000020,
|
||||
LabelUID: "ls6sg6b1wowuy322",
|
||||
LabelSlug: "*tea",
|
||||
CustomSlug: "*tea",
|
||||
LabelSlug: "tea",
|
||||
CustomSlug: "tea",
|
||||
LabelName: "*tea",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -388,8 +388,8 @@ var LabelFixtures = LabelMap{
|
|||
"soup*menu": {
|
||||
ID: 1000021,
|
||||
LabelUID: "ls6sg6b1wowuy323",
|
||||
LabelSlug: "soup*menu",
|
||||
CustomSlug: "soup*menu",
|
||||
LabelSlug: "soup-menu",
|
||||
CustomSlug: "soup-menu",
|
||||
LabelName: "soup*menu",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -405,8 +405,8 @@ var LabelFixtures = LabelMap{
|
|||
"proposal*": {
|
||||
ID: 1000022,
|
||||
LabelUID: "ls6sg6b1wowuy324",
|
||||
LabelSlug: "proposal*",
|
||||
CustomSlug: "proposal*",
|
||||
LabelSlug: "proposal",
|
||||
CustomSlug: "proposal",
|
||||
LabelName: "proposal*",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -422,8 +422,8 @@ var LabelFixtures = LabelMap{
|
|||
"|college": {
|
||||
ID: 1000023,
|
||||
LabelUID: "ls6sg6b1wowuy325",
|
||||
LabelSlug: "|college",
|
||||
CustomSlug: "|college",
|
||||
LabelSlug: "college",
|
||||
CustomSlug: "college",
|
||||
LabelName: "|college",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -439,8 +439,8 @@ var LabelFixtures = LabelMap{
|
|||
"potato|couch": {
|
||||
ID: 1000024,
|
||||
LabelUID: "ls6sg6b1wowuy326",
|
||||
LabelSlug: "potato|couch",
|
||||
CustomSlug: "potato|couch",
|
||||
LabelSlug: "potato-couch",
|
||||
CustomSlug: "potato-couch",
|
||||
LabelName: "potato|couch",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -456,8 +456,8 @@ var LabelFixtures = LabelMap{
|
|||
"mall|": {
|
||||
ID: 1000025,
|
||||
LabelUID: "ls6sg6b1wowuy327",
|
||||
LabelSlug: "mall|",
|
||||
CustomSlug: "mall|",
|
||||
LabelSlug: "mall",
|
||||
CustomSlug: "mall",
|
||||
LabelName: "mall|",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -524,8 +524,8 @@ var LabelFixtures = LabelMap{
|
|||
"\"king": {
|
||||
ID: 1000029,
|
||||
LabelUID: "ls6sg6b1wowuy331",
|
||||
LabelSlug: "\"king",
|
||||
CustomSlug: "\"king",
|
||||
LabelSlug: "king",
|
||||
CustomSlug: "king",
|
||||
LabelName: "\"king",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -541,8 +541,8 @@ var LabelFixtures = LabelMap{
|
|||
"town\"ship": {
|
||||
ID: 1000030,
|
||||
LabelUID: "ls6sg6b1wowuy332",
|
||||
LabelSlug: "town\"ship",
|
||||
CustomSlug: "town\"ship",
|
||||
LabelSlug: "township",
|
||||
CustomSlug: "township",
|
||||
LabelName: "town\"ship",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
@ -558,8 +558,8 @@ var LabelFixtures = LabelMap{
|
|||
"ladder\"": {
|
||||
ID: 1000031,
|
||||
LabelUID: "ls6sg6b1wowuy333",
|
||||
LabelSlug: "ladder\"",
|
||||
CustomSlug: "ladder\"",
|
||||
LabelSlug: "ladder",
|
||||
CustomSlug: "ladder",
|
||||
LabelName: "ladder\"",
|
||||
LabelPriority: 1,
|
||||
LabelFavorite: true,
|
||||
|
|
|
|||
|
|
@ -294,8 +294,8 @@ func TestAlbums(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, "|Banana", result[0].AlbumTitle)
|
||||
assert.Equal(t, "sale%", result[1].AlbumTitle)
|
||||
assert.Equal(t, "sale%", result[0].AlbumTitle)
|
||||
assert.Equal(t, "Yoga***", result[1].AlbumTitle)
|
||||
})
|
||||
t.Run("AlbumSortName", func(t *testing.T) {
|
||||
f := form.SearchAlbums{
|
||||
|
|
@ -312,7 +312,7 @@ func TestAlbums(t *testing.T) {
|
|||
}
|
||||
|
||||
assert.Equal(t, "%gold", result[0].AlbumTitle)
|
||||
assert.Equal(t, "&IlikeFood", result[1].AlbumTitle)
|
||||
assert.Equal(t, "'Family", result[1].AlbumTitle)
|
||||
})
|
||||
t.Run("SortByCount", func(t *testing.T) {
|
||||
f := form.SearchAlbums{
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ func TestPhotosFilterAlbum(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterPercent", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -81,7 +81,7 @@ func TestPhotosFilterAlbum(t *testing.T) {
|
|||
t.Run("StartsWithAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Album = "&IlikeFood"
|
||||
f.Album = "IlikeFood"
|
||||
f.Merged = true
|
||||
|
||||
photos, _, err := Photos(f)
|
||||
|
|
@ -90,7 +90,7 @@ func TestPhotosFilterAlbum(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
//TODO still variable results
|
||||
assert.GreaterOrEqual(t, len(photos), 0)
|
||||
assert.GreaterOrEqual(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -108,7 +108,7 @@ func TestPhotosFilterAlbum(t *testing.T) {
|
|||
t.Run("EndsWithAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Album = "Light&"
|
||||
f.Album = "Light"
|
||||
f.Merged = true
|
||||
|
||||
photos, _, err := Photos(f)
|
||||
|
|
@ -168,7 +168,7 @@ func TestPhotosFilterAlbum(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterAsterisk", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -199,7 +199,7 @@ func TestPhotosFilterAlbum(t *testing.T) {
|
|||
t.Run("StartsWithPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Album = "|Banana"
|
||||
f.Album = "Banana"
|
||||
f.Merged = true
|
||||
|
||||
photos, _, err := Photos(f)
|
||||
|
|
@ -227,7 +227,7 @@ func TestPhotosFilterAlbum(t *testing.T) {
|
|||
t.Run("EndsWithPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Album = "Blue|"
|
||||
f.Album = "Blue"
|
||||
f.Merged = true
|
||||
|
||||
photos, _, err := Photos(f)
|
||||
|
|
@ -316,7 +316,7 @@ func TestPhotosQueryAlbum(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterPercent", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -374,7 +374,7 @@ func TestPhotosQueryAlbum(t *testing.T) {
|
|||
t.Run("EndsWithAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Query = "album:\"Light&\""
|
||||
f.Query = "album:\"Light\""
|
||||
f.Merged = true
|
||||
|
||||
photos, _, err := Photos(f)
|
||||
|
|
@ -436,7 +436,7 @@ func TestPhotosQueryAlbum(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterAsterisk", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -469,7 +469,7 @@ func TestPhotosQueryAlbum(t *testing.T) {
|
|||
t.Run("StartsWithPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Query = "album:\"|Banana\""
|
||||
f.Query = "album:\"Banana\""
|
||||
f.Merged = true
|
||||
|
||||
photos, _, err := Photos(f)
|
||||
|
|
@ -478,7 +478,7 @@ func TestPhotosQueryAlbum(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ func TestPhotosFilterAlbums(t *testing.T) {
|
|||
t.Run("StartsWithAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Albums = "&IlikeFood"
|
||||
f.Albums = "IlikeFood"
|
||||
f.Merged = true
|
||||
|
||||
photos, _, err := Photos(f)
|
||||
|
|
@ -189,7 +189,7 @@ func TestPhotosFilterAlbums(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -299,7 +299,7 @@ func TestPhotosFilterAlbums(t *testing.T) {
|
|||
t.Run("StartsWithPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Albums = "|Banana"
|
||||
f.Albums = "Banana"
|
||||
f.Merged = true
|
||||
|
||||
photos, _, err := Photos(f)
|
||||
|
|
@ -307,7 +307,7 @@ func TestPhotosFilterAlbums(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -634,7 +634,7 @@ func TestPhotosQueryAlbums(t *testing.T) {
|
|||
t.Run("StartsWithAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Query = "albums:\"&IlikeFood\""
|
||||
f.Query = "albums:\"IlikeFood\""
|
||||
f.Merged = true
|
||||
|
||||
photos, _, err := Photos(f)
|
||||
|
|
@ -642,7 +642,7 @@ func TestPhotosQueryAlbums(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -752,7 +752,7 @@ func TestPhotosQueryAlbums(t *testing.T) {
|
|||
t.Run("StartsWithPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Query = "albums:\"|Banana\""
|
||||
f.Query = "albums:\"Banana\""
|
||||
f.Merged = true
|
||||
|
||||
photos, _, err := Photos(f)
|
||||
|
|
@ -760,7 +760,7 @@ func TestPhotosQueryAlbums(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterPercent", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -85,7 +85,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("EndsWithPercent", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -99,7 +99,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("StartsWithAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -113,7 +113,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -127,7 +127,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("EndsWithAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -141,7 +141,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("StartsWithSingleQuote", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -155,7 +155,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterSingleQuote", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -169,7 +169,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("EndsWithSingleQuote", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -183,7 +183,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("StartsWithAsterisk", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -197,7 +197,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterAsterisk", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -211,7 +211,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("EndsWithAsterisk", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -225,7 +225,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("StartsWithPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -239,7 +239,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -267,7 +267,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("StartsWithNumber", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -322,7 +322,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterDoubleQuotes", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -350,7 +350,7 @@ func TestPhotosFilterLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 4)
|
||||
})
|
||||
t.Run("OrSearch", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -431,7 +431,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterPercent", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -444,7 +444,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("EndsWithPercent", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -458,7 +458,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("StartsWithAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -472,7 +472,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -486,7 +486,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("EndsWithAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -500,7 +500,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("StartsWithSingleQuote", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -514,7 +514,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterSingleQuote", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -528,7 +528,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("EndsWithSingleQuote", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -542,7 +542,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("StartsWithAsterisk", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -556,7 +556,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterAsterisk", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -570,7 +570,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("EndsWithAsterisk", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -584,7 +584,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("StartsWithPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -598,7 +598,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("CenterPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
@ -626,7 +626,7 @@ func TestPhotosQueryLabel(t *testing.T) {
|
|||
t.Fatal(err)
|
||||
}
|
||||
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
})
|
||||
t.Run("StartsWithNumber", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
|
|
|||
|
|
@ -417,7 +417,7 @@ func TestPhotosGeoFilterAlbums(t *testing.T) {
|
|||
t.Run("StartsWithAmpersand", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Albums = "&IlikeFood"
|
||||
f.Albums = "IlikeFood"
|
||||
f.Primary = true
|
||||
f.Geo = "yes"
|
||||
|
||||
|
|
@ -426,11 +426,11 @@ func TestPhotosGeoFilterAlbums(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
|
||||
var geo form.SearchPhotosGeo
|
||||
|
||||
geo.Albums = "&IlikeFood"
|
||||
geo.Albums = "IlikeFood"
|
||||
|
||||
// Parse query string and filter.
|
||||
if err = geo.ParseQueryString(); err != nil {
|
||||
|
|
@ -696,7 +696,7 @@ func TestPhotosGeoFilterAlbums(t *testing.T) {
|
|||
t.Run("StartsWithPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Albums = "|Banana"
|
||||
f.Albums = "Banana"
|
||||
f.Primary = true
|
||||
f.Geo = "yes"
|
||||
|
||||
|
|
@ -705,11 +705,11 @@ func TestPhotosGeoFilterAlbums(t *testing.T) {
|
|||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
assert.Equal(t, len(photos), 0)
|
||||
assert.Equal(t, len(photos), 1)
|
||||
|
||||
var geo form.SearchPhotosGeo
|
||||
|
||||
geo.Albums = "|Banana"
|
||||
geo.Albums = "Banana"
|
||||
|
||||
// Parse query string and filter.
|
||||
if err = geo.ParseQueryString(); err != nil {
|
||||
|
|
@ -1733,7 +1733,7 @@ func TestPhotosGeoQueryAlbums(t *testing.T) {
|
|||
t.Run("StartsWithPipe", func(t *testing.T) {
|
||||
var f form.SearchPhotos
|
||||
|
||||
f.Query = "albums:\"|Banana\""
|
||||
f.Query = "albums:\"Banana\""
|
||||
f.Primary = true
|
||||
f.Geo = "yes"
|
||||
|
||||
|
|
@ -1744,7 +1744,7 @@ func TestPhotosGeoQueryAlbums(t *testing.T) {
|
|||
}
|
||||
var geo form.SearchPhotosGeo
|
||||
|
||||
geo.Query = "albums:\"|Banana\""
|
||||
geo.Query = "albums:\"Banana\""
|
||||
|
||||
// Parse query string and filter.
|
||||
if err = geo.ParseQueryString(); err != nil {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue