Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 0 additions & 44 deletions packages/core/shield/src/action.rs
Original file line number Diff line number Diff line change
Expand Up @@ -91,47 +91,3 @@ macro_rules! erased_action {
}
};
}

#[cfg(test)]
pub(crate) mod tests {
use async_trait::async_trait;

use crate::{
error::ShieldError, form::Form, provider::tests::TestProvider, request::Request,
response::Response, session::Session,
};

use super::Action;

pub const TEST_ACTION_ID: &str = "test";
pub const TEST_ACTION_NAME: &str = "Test";

#[derive(Default)]
pub struct TestAction {}

#[async_trait]
impl Action<TestProvider> for TestAction {
fn id(&self) -> String {
TEST_ACTION_ID.to_owned()
}

fn name(&self) -> String {
TEST_ACTION_NAME.to_owned()
}

fn form(&self, _provider: TestProvider) -> Form {
Form { inputs: vec![] }
}

async fn call(
&self,
_provider: TestProvider,
_session: Session,
_request: Request,
) -> Result<Response, ShieldError> {
Ok(Response::Default)
}
}

erased_action!(TestAction);
}
45 changes: 0 additions & 45 deletions packages/core/shield/src/method.rs
Original file line number Diff line number Diff line change
Expand Up @@ -90,48 +90,3 @@ macro_rules! erased_method {
}
};
}

#[cfg(test)]
pub(crate) mod tests {
use async_trait::async_trait;

use crate::{
action::{Action, tests::TestAction},
error::ShieldError,
provider::tests::TestProvider,
};

use super::Method;

pub const TEST_METHOD_ID: &str = "test";

#[derive(Default)]
pub struct TestMethod {
id: Option<&'static str>,
}

impl TestMethod {
// TODO
pub fn _with_id(mut self, id: &'static str) -> Self {
self.id = Some(id);
self
}
}

#[async_trait]
impl Method<TestProvider> for TestMethod {
fn id(&self) -> String {
self.id.unwrap_or(TEST_METHOD_ID).to_owned()
}

fn actions(&self) -> Vec<Box<dyn Action<TestProvider>>> {
vec![Box::new(TestAction::default())]
}

async fn providers(&self) -> Result<Vec<TestProvider>, ShieldError> {
Ok(vec![TestProvider::default()])
}
}

erased_method!(TestMethod);
}
29 changes: 0 additions & 29 deletions packages/core/shield/src/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,3 @@ pub trait Provider: Send + Sync {

fn name(&self) -> String;
}

#[cfg(test)]
pub(crate) mod tests {
use async_trait::async_trait;

use crate::method::tests::TEST_METHOD_ID;

use super::Provider;

pub const TEST_PROVIDER_NAME: &str = "Test";

#[derive(Default)]
pub struct TestProvider {}

#[async_trait]
impl Provider for TestProvider {
fn method_id(&self) -> String {
TEST_METHOD_ID.to_owned()
}

fn id(&self) -> Option<String> {
None
}

fn name(&self) -> String {
TEST_PROVIDER_NAME.to_owned()
}
}
}
8 changes: 4 additions & 4 deletions packages/core/shield/src/shield.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ impl<U: User> Shield<U> {
};

let name = action.erased_name();
if let Some(action_name) = &action_name {
if *action_name != name {
warn!("Action name mismatch `{}` != `{}`", action_name, name);
}
if let Some(action_name) = &action_name
&& *action_name != name
{
warn!("Action name mismatch `{}` != `{}`", action_name, name);
}
action_name = Some(name);

Expand Down
Loading