Skip to content

Commit 5f5e5f8

Browse files
author
Andronik Ordian
committed
Rename gitlab to git-lab
1 parent 70b5481 commit 5f5e5f8

File tree

6 files changed

+9
-8
lines changed

6 files changed

+9
-8
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
UPDATE badges SET badge_type = replace(badge_type, 'git-lab', 'gitlab');
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
UPDATE badges SET badge_type = replace(badge_type, 'gitlab', 'git-lab');

mirage/fixtures/crates.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export default [{
7676
"branch": "master",
7777
"repository": "huonw/external_mixin"
7878
},
79-
"badge_type": "gitlab"
79+
"badge_type": "git-lab"
8080
},
8181
{
8282
"attributes": {

src/badge.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ pub enum Badge {
1919
branch: Option<String>,
2020
service: Option<String>,
2121
},
22-
#[serde(rename = "gitlab")]
2322
GitLab {
2423
repository: String,
2524
branch: Option<String>,
@@ -62,7 +61,7 @@ impl Badge {
6261
match *self {
6362
Badge::TravisCi { .. } => "travis-ci",
6463
Badge::Appveyor { .. } => "appveyor",
65-
Badge::GitLab { .. } => "gitlab",
64+
Badge::GitLab { .. } => "git-lab",
6665
Badge::IsItMaintainedIssueResolution { .. } => "is-it-maintained-issue-resolution",
6766
Badge::IsItMaintainedOpenIssues { .. } => "is-it-maintained-open-issues",
6867
Badge::Codecov { .. } => "codecov",

src/tests/badge.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ fn update_add_gitlab() {
158158
let conn = app.diesel_database.get().unwrap();
159159

160160
let mut badges = HashMap::new();
161-
badges.insert(String::from("gitlab"), test_badges.gitlab_attributes);
161+
badges.insert(String::from("git-lab"), test_badges.gitlab_attributes);
162162
Badge::update_crate(&conn, &krate, Some(&badges)).unwrap();
163163
assert_eq!(krate.badges(&conn).unwrap(), vec![test_badges.gitlab]);
164164
}
@@ -231,7 +231,7 @@ fn replace_badge() {
231231

232232
// Add a badge
233233
let mut badges = HashMap::new();
234-
badges.insert(String::from("gitlab"), test_badges.gitlab_attributes);
234+
badges.insert(String::from("git-lab"), test_badges.gitlab_attributes);
235235
Badge::update_crate(&conn, &krate, Some(&badges)).unwrap();
236236
assert_eq!(krate.badges(&conn).unwrap(), vec![test_badges.gitlab]);
237237

@@ -288,7 +288,7 @@ fn clear_badges() {
288288
// Adding 3 badges
289289
badges.insert(String::from("appveyor"), test_badges.appveyor_attributes);
290290
badges.insert(String::from("travis-ci"), test_badges.travis_ci_attributes);
291-
badges.insert(String::from("gitlab"), test_badges.gitlab_attributes);
291+
badges.insert(String::from("git-lab"), test_badges.gitlab_attributes);
292292
Badge::update_crate(&conn, &krate, Some(&badges)).unwrap();
293293

294294
let current_badges = krate.badges(&conn).unwrap();
@@ -348,11 +348,11 @@ fn gitlab_required_keys() {
348348

349349
// Repository is a required key
350350
test_badges.gitlab_attributes.remove("repository");
351-
badges.insert(String::from("gitlab"), test_badges.gitlab_attributes);
351+
badges.insert(String::from("git-lab"), test_badges.gitlab_attributes);
352352

353353
let invalid_badges = Badge::update_crate(&conn, &krate, Some(&badges)).unwrap();
354354
assert_eq!(invalid_badges.len(), 1);
355-
assert!(invalid_badges.contains(&"gitlab"));
355+
assert!(invalid_badges.contains(&"git-lab"));
356356
assert_eq!(krate.badges(&conn).unwrap(), vec![]);
357357
}
358358

0 commit comments

Comments
 (0)