global schema fixed for good3
This commit is contained in:
2
client
2
client
Submodule client updated: e104825edc...53ec9866af
Submodule client-gui2 updated: f3ae817797...c14ecbe687
2
server
2
server
Submodule server updated: 81a49d66d6...32374830ed
@@ -247,7 +247,7 @@ mod tests {
|
|||||||
});
|
});
|
||||||
AddTablePageState {
|
AddTablePageState {
|
||||||
nav: crate::ui::Nav::default(),
|
nav: crate::ui::Nav::default(),
|
||||||
shared_profile: "__global".to_string(),
|
shared_profile: "global".to_string(),
|
||||||
profiles: vec!["billing".to_string()],
|
profiles: vec!["billing".to_string()],
|
||||||
rate_sources: vec!["ecb".to_string()],
|
rate_sources: vec!["ecb".to_string()],
|
||||||
draft,
|
draft,
|
||||||
|
|||||||
@@ -505,7 +505,7 @@ mod tests {
|
|||||||
fn the_column_list_shows_what_a_definition_row_expands_into() {
|
fn the_column_list_shows_what_a_definition_row_expands_into() {
|
||||||
let mut page = AddTablePageState {
|
let mut page = AddTablePageState {
|
||||||
nav: crate::ui::Nav::default(),
|
nav: crate::ui::Nav::default(),
|
||||||
shared_profile: "__global".to_string(),
|
shared_profile: "global".to_string(),
|
||||||
profiles: Vec::new(),
|
profiles: Vec::new(),
|
||||||
rate_sources: vec!["ecb".to_string()],
|
rate_sources: vec!["ecb".to_string()],
|
||||||
draft: posted_form().to_draft(),
|
draft: posted_form().to_draft(),
|
||||||
@@ -592,7 +592,7 @@ mod tests {
|
|||||||
|
|
||||||
let page = AddTablePageState {
|
let page = AddTablePageState {
|
||||||
nav: crate::ui::Nav::default(),
|
nav: crate::ui::Nav::default(),
|
||||||
shared_profile: "__global".to_string(),
|
shared_profile: "global".to_string(),
|
||||||
profiles: Vec::new(),
|
profiles: Vec::new(),
|
||||||
rate_sources: vec!["ecb".to_string()],
|
rate_sources: vec!["ecb".to_string()],
|
||||||
draft,
|
draft,
|
||||||
|
|||||||
@@ -109,7 +109,7 @@ mod tests {
|
|||||||
|
|
||||||
AddTablePageState {
|
AddTablePageState {
|
||||||
nav: Nav::default(),
|
nav: Nav::default(),
|
||||||
shared_profile: "__global".to_string(),
|
shared_profile: "global".to_string(),
|
||||||
profiles: vec!["billing".to_string()],
|
profiles: vec!["billing".to_string()],
|
||||||
rate_sources: vec!["ecb".to_string()],
|
rate_sources: vec!["ecb".to_string()],
|
||||||
draft,
|
draft,
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ mod tests {
|
|||||||
/// What this deployment's server happens to call the shared profile. The
|
/// What this deployment's server happens to call the shared profile. The
|
||||||
/// page is handed the name rather than knowing it, so the tests spell it
|
/// page is handed the name rather than knowing it, so the tests spell it
|
||||||
/// once here.
|
/// once here.
|
||||||
const SHARED_PROFILE: &str = "__global";
|
const SHARED_PROFILE: &str = "global";
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn dashboard_links_every_admin_action() {
|
fn dashboard_links_every_admin_action() {
|
||||||
@@ -131,7 +131,7 @@ mod tests {
|
|||||||
};
|
};
|
||||||
|
|
||||||
let html = render_workspace(&page);
|
let html = render_workspace(&page);
|
||||||
assert!(html.contains(r#"name="profile" value="__global""#));
|
assert!(html.contains(r#"name="profile" value="global""#));
|
||||||
assert!(html.contains("shared by every profile"));
|
assert!(html.contains("shared by every profile"));
|
||||||
// Selecting it marks it, and its empty state names the global scope
|
// Selecting it marks it, and its empty state names the global scope
|
||||||
// rather than a profile that has no tables.
|
// rather than a profile that has no tables.
|
||||||
@@ -209,7 +209,7 @@ mod tests {
|
|||||||
|
|
||||||
let html = render_workspace(&page);
|
let html = render_workspace(&page);
|
||||||
assert!(
|
assert!(
|
||||||
html.contains("/admin/tables/delete?profile=__global&table=currencies"),
|
html.contains("/admin/tables/delete?profile=global&table=currencies"),
|
||||||
"{html}"
|
"{html}"
|
||||||
);
|
);
|
||||||
assert!(html.contains("/admin/tables/new?global=true"));
|
assert!(html.contains("/admin/tables/new?global=true"));
|
||||||
|
|||||||
@@ -258,7 +258,7 @@ mod tests {
|
|||||||
|
|
||||||
/// What this deployment's server happens to call the shared profile. The
|
/// What this deployment's server happens to call the shared profile. The
|
||||||
/// page is handed the name rather than knowing it.
|
/// page is handed the name rather than knowing it.
|
||||||
const SHARED_PROFILE: &str = "__global";
|
const SHARED_PROFILE: &str = "global";
|
||||||
|
|
||||||
fn page() -> TableDefinitionPageState {
|
fn page() -> TableDefinitionPageState {
|
||||||
TableDefinitionPageState {
|
TableDefinitionPageState {
|
||||||
|
|||||||
@@ -66,7 +66,7 @@ pub(crate) mod tests {
|
|||||||
|
|
||||||
/// What this deployment's server happens to call the shared profile; the
|
/// What this deployment's server happens to call the shared profile; the
|
||||||
/// tables carry it, and nothing here composes it.
|
/// tables carry it, and nothing here composes it.
|
||||||
const SHARED_PROFILE: &str = "__global";
|
const SHARED_PROFILE: &str = "global";
|
||||||
|
|
||||||
pub(crate) fn table(name: &str, global: bool) -> Table {
|
pub(crate) fn table(name: &str, global: bool) -> Table {
|
||||||
Table {
|
Table {
|
||||||
|
|||||||
Reference in New Issue
Block a user