mirror/mCaptcha
1
0
Fork 1
mirror of https://github.com/mCaptcha/mCaptcha.git synced 2026-02-11 10:05:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

cache_bustere upgrade and static assets tests

Browse Source
This commit is contained in:
realaravinth
2021-04-30 21:34:44 +05:30
parent 343c37ae1c
commit c96f890236
8 changed files with 126 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/v1/auth.rs
View File

@@ -62,7 +62,7 @@ pub async fn signup(
// }
if let Some(email) = &payload.email {
data.creds.email(Some(&email))?;
data.creds.email(&email)?;
}
let mut secret;
@@ -223,7 +223,7 @@ pub async fn set_email(
let username = id.identity().unwrap();
data.creds.email(Some(&payload.email))?;
data.creds.email(&payload.email)?;
let res = sqlx::query!(
"UPDATE mcaptcha_users set email = $1

1
src/cache_buster_data.json Normal file
View File

@@ -0,0 +1 @@
{"map":{"./static/img/svg/github.svg":"./prod/img/svg/github.FA9EB1C66F548EC2C7598B94BA6A17275E1EA383D42B6C83351A2388C773E621.svg","./static/img/svg/globe.svg":"./prod/img/svg/globe.44C2A069EBD637663E938ECE7B8E4EC2A8BDE049A8A044EC68D9CB69AE8C592E.svg","./static/img/svg/message-square.svg":"./prod/img/svg/message-square.E246A6B2AAEFCE8A62B9BDD2D155D3B4923C3E48325EAEF099D509A2D7BB4DD1.svg","./static/img/svg/shield.svg":"./prod/img/svg/shield.13AFE15DCB4882B4A940CFDC3E2088A733CD4E6F97F25B211D87C7C9D6DBA2B6.svg","./static/img/svg/filter.svg":"./prod/img/svg/filter.6D5FBD96BA2E2020663AAC4994A991295917D73F3592C07EE103647B655A2275.svg","./static/img/svg/moon.svg":"./prod/img/svg/moon.1E151D68949CA3B2DC7DE34BC25B7586E4175AC3BA7F56DDBB34227334EF7155.svg","./static/img/svg/toggle-left.svg":"./prod/img/svg/toggle-left.E421950C5922E84015F0A86F272AE5637A2ED96E267D2C962543F5994E5D1172.svg","./static/img/svg/menu.svg":"./prod/img/svg/menu.A2C4DD00686F5D23F78885AC4CE3E075FCA78DFBDEA70407667FBBD9801B7A75.svg","./static/img/icon.png":"./prod/img/icon.CC75A040D5F432E5DC9043D10B94BF1FC3BAE1D02A8C2030F655E642EAD4A32C.png","./static/img/svg/key.svg":"./prod/img/svg/key.F0AACBED8D0F7A279977392F92F4DA73C35E905AC73B3C83320D54856E627EEC.svg","./static/img/svg/help-circle.svg":"./prod/img/svg/help-circle.BE230ABD2E05EB05EF6C5B7D04D35A3A43637EF1E046DEF3D244425609B99F81.svg","./static/img/svg/file.svg":"./prod/img/svg/file.F9E376D9F78FFD918D8D592A8B2D97EAAC14E638B5A7AE3C58DDB075375D8E0E.svg","./static/img/icon-trans.png":"./prod/img/icon-trans.7920418313D84DCDB2491E02E52E4BEF374970C216E85BD721274EE51241ECD4.png","./static/img/svg/shield-off.svg":"./prod/img/svg/shield-off.85394A6AD92D550F8EBA72AAB095E078E7A0E3359DF81174532C8D1AF53B5876.svg","./static/img/svg/eye-off.svg":"./prod/img/svg/eye-off.939360B335D1D35B57C3E2070129D14ABB168E4AC137B5BE4F6F8BD450B712F5.svg","./static/img/svg/credit-card.svg":"./prod/img/svg/credit-card.DF612AFE367A7B31410F2F6CD3C7B515B0F1889C0107EA695D840DFFA492E07D.svg","./static/img/svg/settings.svg":"./prod/img/svg/settings.910C6241743C9C694141971BE8E1C4016A1A5BF203E4E9D676D4CE93BD518F4C.svg","./static/img/svg/user.svg":"./prod/img/svg/user.B164ECD2C4A09DC5189F1F252487E2AC6A33646BEA67AF9C528CDA61FE5E146F.svg","./static/img/svg/toggle-right.svg":"./prod/img/svg/toggle-right.15BF49887941593CE3FE09FA73E3CAF1F4B1E8ABCB42A23D85B4FCBC24FDF5AA.svg","./static/img/svg/eye.svg":"./prod/img/svg/eye.9DE4D24D3C9B055D02B94A8AD65E8C0C644852381FDD131A64448B6DA7859167.svg","./static/img/svg/tag.svg":"./prod/img/svg/tag.E0BC111B8E81BBFC62B6A9E7E4AC162B7085A6543D995B7A0030CB7632901BD4.svg","./static/bundle/main.css":"./prod/bundle/main.C7B0ACE647935B5E61BD692A0EB6AFF167CAB2F80483079378CF7A18D7FF9466.css","./static/img/svg/file-text.svg":"./prod/img/svg/file-text.CF57DF252051E7E81C240D36AF1DB8A9DDAF282F9A5E8C338408FE88A6545A02.svg","./static/bundle/main.js":"./prod/bundle/main.736EA02160A042CFB6310C65CB61D8F2578A457254FBDBD1F00009320D8BF903.js","./static/img/svg/bell.svg":"./prod/img/svg/bell.9DA292704EE9907EFDB870F4510C97336977CA27FBFAAD83CF46F8E22D3828F7.svg","./static/img/svg/home.svg":"./prod/img/svg/home.28C26C2D3E4013D24D755A589A80D8DD5C49DA5397032E3F09B76BC3A2C314ED.svg","./static/img/svg/log-out.svg":"./prod/img/svg/log-out.92AB4384FD41D9AFE4735C480361BB64789CD767B7DD0FF3C6F56287B3D4498E.svg"},"base_dir":"./prod"}

5
src/main.rs
View File

@@ -42,7 +42,10 @@ pub use settings::Settings;
lazy_static! {
pub static ref SETTINGS: Settings = Settings::new().unwrap();
pub static ref S: String = env::var("S").unwrap();
pub static ref FILES: FileMap = FileMap::load();
pub static ref FILES: FileMap = {
let map = include_str!("cache_buster_data.json");
FileMap::new(&map)
};
pub static ref JS: &'static str = FILES.get("./static/bundle/main.js").unwrap();
pub static ref CSS: &'static str = FILES.get("./static/bundle/main.css").unwrap();
}

40
src/static_assets.rs
View File

@@ -50,23 +50,23 @@ pub fn services(cfg: &mut web::ServiceConfig) {
cfg.service(dist);
}
//#[cfg(test)]
//mod tests {
// use actix_web::http::StatusCode;
// use actix_web::test;
//
// use super::*;
// use crate::*;
//
// #[actix_rt::test]
// async fn static_assets_work() {
// let mut app = test::init_service(App::new().configure(services)).await;
//
// let resp = test::call_service(
// &mut app,
// test::TestRequest::get().uri(&*crate::JS).to_request(),
// )
// .await;
// assert_eq!(resp.status(), StatusCode::OK);
// }
//}
#[cfg(test)]
mod tests {
use actix_web::http::StatusCode;
use actix_web::test;
use super::*;
use crate::*;
#[actix_rt::test]
async fn static_assets_work() {
let mut app = test::init_service(App::new().configure(services)).await;
let resp = test::call_service(
&mut app,
test::TestRequest::get().uri(&*crate::JS).to_request(),
)
.await;
assert_eq!(resp.status(), StatusCode::OK);
}
}

46
src/templates/mod.rs
View File

@@ -29,24 +29,28 @@ pub fn services(cfg: &mut ServiceConfig) {
cfg.service(panel::sitekey::add_sitekey);
}
//#[cfg(not(tarpaulin_include))]
//#[cfg(test)]
//mod tests {
// use actix_web::http::StatusCode;
// use actix_web::test;
//
// use super::*;
// use crate::*;
//
// #[actix_rt::test]
// async fn templates_work() {
// let mut app = test::init_service(App::new().configure(services)).await;
// let urls = vec!["/", "/join", "/panel"];
//
// for url in urls.iter() {
// let resp =
// test::call_service(&mut app, test::TestRequest::get().uri(url).to_request()).await;
// assert_eq!(resp.status(), StatusCode::OK);
// }
// }
//}
#[cfg(not(tarpaulin_include))]
#[cfg(test)]
mod tests {
use actix_web::http::StatusCode;
use actix_web::test;
use super::*;
use crate::*;
#[actix_rt::test]
async fn templates_work() {
let mut app = test::init_service(App::new().configure(services)).await;
let urls = vec!["/", "/join", "/login", "/sitekey/add"];
for url in urls.iter() {
let resp =
test::call_service(&mut app, test::TestRequest::get().uri(url).to_request()).await;
if url == urls.get(0).unwrap() {
assert_eq!(resp.status(), StatusCode::TEMPORARY_REDIRECT);
} else {
assert_eq!(resp.status(), StatusCode::OK);
}
}
}
}