Skip to content

Commit

Permalink
fix(search): ignore commas between hashtags
Browse files Browse the repository at this point in the history
  • Loading branch information
flosse committed Nov 8, 2018
1 parent a9aa2cb commit 377afe1
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 0 deletions.
31 changes: 31 additions & 0 deletions src/ports/web/tests.rs
Expand Up @@ -472,6 +472,37 @@ fn search_with_two_hashtags() {
assert!(body_str.contains(r#""visible":[{"id":"b","lat":0.0,"lng":0.0}]"#,));
}

#[test]
fn search_with_commata() {
let entries = vec![
Entry::build().id("a").finish(),
Entry::build()
.tags(vec!["eins", "zwei"])
.id("b")
.finish(),
Entry::build().tags(vec!["eins"]).id("c").finish(),
Entry::build().tags(vec!["eins", "zwei"]).id("d").finish(),
];
let (client, db) = setup();
let mut conn = db.get().unwrap();
conn.create_tag_if_it_does_not_exist(&Tag {
id: "eins".into(),
})
.unwrap();
conn.create_tag_if_it_does_not_exist(&Tag {
id: "zwei".into(),
})
.unwrap();
for e in entries {
conn.create_entry(&e).unwrap();
}
let req = client.get("/search?bbox=-10,-10,10,10&text=%23eins%2C%20%23zwei");
let mut response = req.dispatch();
assert_eq!(response.status(), Status::Ok);
let body_str = response.body().and_then(|b| b.into_string()).unwrap();
assert!(body_str.contains(r#""visible":[{"id":"b","lat":0.0,"lng":0.0},{"id":"d","lat":0.0,"lng":0.0}]"#,));
}

#[test]
fn search_without_specifying_hashtag_symbol() {
let entries = vec![
Expand Down
1 change: 1 addition & 0 deletions src/ports/web/util.rs
Expand Up @@ -98,6 +98,7 @@ pub fn remove_hash_tags(text: &str) -> String {
.replace_all(text, "")
.into_owned()
.replace(" ", " ")
.replace(",", "")
.trim()
.into()
}

0 comments on commit 377afe1

Please sign in to comment.