Skip to content

Commit 7c060b1

Browse files
ffreddowffreddow
committed
backend: run rustfmt
1 parent 569596d commit 7c060b1

File tree

7 files changed

+18
-53
lines changed

7 files changed

+18
-53
lines changed

‎backend/src/routes/grouping/add_device_to_grouping.rs‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -144,9 +144,7 @@ mod tests {
144144

145145
use crate::{
146146
routes::{
147-
grouping::{
148-
configure, get_groupings::GetGroupingsResponse, test_helpers::*,
149-
},
147+
grouping::{configure, get_groupings::GetGroupingsResponse, test_helpers::*},
150148
user::tests::TestUser,
151149
},
152150
tests::configure as test_configure,
@@ -164,9 +162,7 @@ mod tests {
164162
// Create a grouping
165163
let grouping = create_test_grouping(&token, "Test Group").await;
166164

167-
let app = App::new()
168-
.configure(test_configure)
169-
.configure(configure);
165+
let app = App::new().configure(test_configure).configure(configure);
170166
let app = test::init_service(app).await;
171167

172168
let body = AddDeviceToGroupingSchema {
@@ -205,9 +201,7 @@ mod tests {
205201
let charger = user.add_charger(charger_id).await;
206202
let grouping = create_test_grouping(&token, "Test Group").await;
207203

208-
let app = App::new()
209-
.configure(test_configure)
210-
.configure(configure);
204+
let app = App::new().configure(test_configure).configure(configure);
211205
let app = test::init_service(app).await;
212206

213207
let body = AddDeviceToGroupingSchema {
@@ -252,9 +246,7 @@ mod tests {
252246
// User 2 creates a grouping
253247
let grouping = create_test_grouping(&token2, "User2 Group").await;
254248

255-
let app = App::new()
256-
.configure(test_configure)
257-
.configure(configure);
249+
let app = App::new().configure(test_configure).configure(configure);
258250
let app = test::init_service(app).await;
259251

260252
// User 2 tries to add User 1's charger to their grouping
@@ -291,9 +283,7 @@ mod tests {
291283
// Create grouping
292284
let grouping = create_test_grouping(&token, "Multi-Device Group").await;
293285

294-
let app = App::new()
295-
.configure(test_configure)
296-
.configure(configure);
286+
let app = App::new().configure(test_configure).configure(configure);
297287
let app = test::init_service(app).await;
298288

299289
// Add both devices to grouping
@@ -348,9 +338,7 @@ mod tests {
348338
let charger = user.add_charger(charger_id).await;
349339
let grouping = create_test_grouping(&token, "Cascade Test").await;
350340

351-
let app = App::new()
352-
.configure(test_configure)
353-
.configure(configure);
341+
let app = App::new().configure(test_configure).configure(configure);
354342
let app = test::init_service(app).await;
355343

356344
// Add device to grouping

‎backend/src/routes/grouping/create_grouping.rs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,7 @@ pub async fn create_grouping(
9090

9191
#[cfg(test)]
9292
mod tests {
93-
use crate::routes::{
94-
grouping::test_helpers::*,
95-
user::tests::TestUser,
96-
};
93+
use crate::routes::{grouping::test_helpers::*, user::tests::TestUser};
9794

9895
#[actix_web::test]
9996
async fn test_create_grouping() {

‎backend/src/routes/grouping/delete_grouping.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,7 @@ mod tests {
110110

111111
let grouping = create_test_grouping(token, "To Delete").await;
112112

113-
let app = App::new()
114-
.configure(test_configure)
115-
.configure(configure);
113+
let app = App::new().configure(test_configure).configure(configure);
116114
let app = test::init_service(app).await;
117115

118116
let body = DeleteGroupingSchema {
@@ -144,9 +142,7 @@ mod tests {
144142
// User 1 creates a grouping
145143
let grouping = create_test_grouping(token1, "User1 Grouping").await;
146144

147-
let app = App::new()
148-
.configure(test_configure)
149-
.configure(configure);
145+
let app = App::new().configure(test_configure).configure(configure);
150146
let app = test::init_service(app).await;
151147

152148
// User 2 tries to delete it

‎backend/src/routes/grouping/get_groupings.rs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,7 @@ mod tests {
125125
let (mut user, _) = TestUser::random().await;
126126
let token = user.login().await;
127127

128-
let app = App::new()
129-
.configure(test_configure)
130-
.configure(configure);
128+
let app = App::new().configure(test_configure).configure(configure);
131129
let app = test::init_service(app).await;
132130

133131
let cookie = Cookie::new("access_token", token);
@@ -152,9 +150,7 @@ mod tests {
152150
let grouping1 = create_test_grouping(token, "Grouping 1").await;
153151
let grouping2 = create_test_grouping(token, "Grouping 2").await;
154152

155-
let app = App::new()
156-
.configure(test_configure)
157-
.configure(configure);
153+
let app = App::new().configure(test_configure).configure(configure);
158154
let app = test::init_service(app).await;
159155

160156
let cookie = Cookie::new("access_token", token);

‎backend/src/routes/grouping/mod.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
* Boston, MA 02111-1307, USA.
1818
*/
1919

20+
pub mod add_device_to_grouping;
2021
pub mod create_grouping;
2122
pub mod delete_grouping;
22-
pub mod add_device_to_grouping;
23-
pub mod remove_device_from_grouping;
2423
pub mod get_groupings;
24+
pub mod remove_device_from_grouping;
2525

2626
#[cfg(test)]
2727
pub(crate) mod test_helpers;
@@ -39,4 +39,3 @@ pub fn configure(cfg: &mut web::ServiceConfig) {
3939
.service(get_groupings::get_groupings);
4040
cfg.service(scope);
4141
}
42-

‎backend/src/routes/grouping/remove_device_from_grouping.rs‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,7 @@ mod tests {
116116
use crate::{
117117
routes::{
118118
grouping::{
119-
add_device_to_grouping::AddDeviceToGroupingSchema,
120-
configure, test_helpers::*,
119+
add_device_to_grouping::AddDeviceToGroupingSchema, configure, test_helpers::*,
121120
},
122121
user::tests::TestUser,
123122
},
@@ -133,9 +132,7 @@ mod tests {
133132
let charger = user.add_charger(charger_id).await;
134133
let grouping = create_test_grouping(&token, "Test Group").await;
135134

136-
let app = App::new()
137-
.configure(test_configure)
138-
.configure(configure);
135+
let app = App::new().configure(test_configure).configure(configure);
139136
let app = test::init_service(app).await;
140137

141138
// Add device to grouping
@@ -184,9 +181,7 @@ mod tests {
184181
let charger = user.add_charger(charger_id).await;
185182
let grouping = create_test_grouping(&token, "Test Group").await;
186183

187-
let app = App::new()
188-
.configure(test_configure)
189-
.configure(configure);
184+
let app = App::new().configure(test_configure).configure(configure);
190185
let app = test::init_service(app).await;
191186

192187
// Try to remove device that was never added

‎backend/src/routes/grouping/test_helpers.rs‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,8 @@ use crate::tests::configure as test_configure;
2626
use create_grouping::{CreateGroupingResponse, CreateGroupingSchema};
2727

2828
/// Helper function to create a test grouping
29-
pub async fn create_test_grouping(
30-
access_token: &str,
31-
name: &str,
32-
) -> CreateGroupingResponse {
33-
let app = App::new()
34-
.configure(test_configure)
35-
.configure(configure);
29+
pub async fn create_test_grouping(access_token: &str, name: &str) -> CreateGroupingResponse {
30+
let app = App::new().configure(test_configure).configure(configure);
3631
let app = test::init_service(app).await;
3732

3833
let body = CreateGroupingSchema {
@@ -94,4 +89,3 @@ pub fn count_grouping_members(grouping_id_str: &str) -> i64 {
9489
.get_result(&mut conn)
9590
.unwrap_or(0)
9691
}
97-

0 commit comments

Comments
 (0)