yume/juniper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Comment out attr_arg_descr and attr_arg_descr_collapse tests

Browse source
This commit is contained in:
nWacky 2019-11-05 12:06:08 +03:00
parent ec76bf5ff2
commit 99c0d26887
No known key found for this signature in database
GPG key ID: 22EF2C62F6F79FD0
2 changed files with 93 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

148
juniper/src/macros/tests/args.rs
View file

@ -73,12 +73,17 @@ impl Root {
0
}
fn attr_arg_descr(arg: i32) -> i32 {
0
}
fn attr_arg_descr_collapse(arg: i32) -> i32 {
0
}
// TODO: enable once [this issue](https://github.com/graphql-rust/juniper/pull/441) is implemented
// fn attr_arg_descr(
// #[graphql(description = "The arg")]
// arg: i32) -> i32
// { 0 }
//
// fn attr_arg_descr_collapse(
// #[graphql(description = "The first arg")]
// #[graphql(description = "and more details")]
// arg: i32,
// ) -> i32 { 0 }
#[graphql(arguments(arg(default = 123,),))]
fn arg_with_default(arg: i32) -> i32 {
@ -558,71 +563,72 @@ fn introspect_field_multi_args_descr_trailing_comma() {
});
}
#[test]
fn introspect_field_attr_arg_descr() {
run_args_info_query("attrArgDescr", |args| {
assert_eq!(args.len(), 1);
assert!(args.contains(&Value::object(
vec![
("name", Value::scalar("arg")),
("description", Value::scalar("The arg")),
("defaultValue", Value::null()),
(
"type",
Value::object(
vec![
("name", Value::null()),
(
"ofType",
Value::object(
vec![("name", Value::scalar("Int"))].into_iter().collect(),
),
),
]
.into_iter()
.collect(),
),
),
]
.into_iter()
.collect(),
)));
});
}
#[test]
fn introspect_field_attr_arg_descr_collapse() {
run_args_info_query("attrArgDescrCollapse", |args| {
assert_eq!(args.len(), 1);
assert!(args.contains(&Value::object(
vec![
("name", Value::scalar("arg")),
("description", Value::scalar("The arg\nand more details")),
("defaultValue", Value::null()),
(
"type",
Value::object(
vec![
("name", Value::null()),
(
"ofType",
Value::object(
vec![("name", Value::scalar("Int"))].into_iter().collect(),
),
),
]
.into_iter()
.collect(),
),
),
]
.into_iter()
.collect(),
)));
});
}
// TODO: enable once [this issue](https://github.com/graphql-rust/juniper/pull/441) is implemented
//#[test]
//fn introspect_field_attr_arg_descr() {
// run_args_info_query("attrArgDescr", |args| {
// assert_eq!(args.len(), 1);
//
// assert!(args.contains(&Value::object(
// vec![
// ("name", Value::scalar("arg")),
// ("description", Value::scalar("The arg")),
// ("defaultValue", Value::null()),
// (
// "type",
// Value::object(
// vec![
// ("name", Value::null()),
// (
// "ofType",
// Value::object(
// vec![("name", Value::scalar("Int"))].into_iter().collect(),
// ),
// ),
// ]
// .into_iter()
// .collect(),
// ),
// ),
// ]
// .into_iter()
// .collect(),
// )));
// });
//}
//
//#[test]
//fn introspect_field_attr_arg_descr_collapse() {
// run_args_info_query("attrArgDescrCollapse", |args| {
// assert_eq!(args.len(), 1);
//
// assert!(args.contains(&Value::object(
// vec![
// ("name", Value::scalar("arg")),
// ("description", Value::scalar("The arg\nand more details")),
// ("defaultValue", Value::null()),
// (
// "type",
// Value::object(
// vec![
// ("name", Value::null()),
// (
// "ofType",
// Value::object(
// vec![("name", Value::scalar("Int"))].into_iter().collect(),
// ),
// ),
// ]
// .into_iter()
// .collect(),
// ),
// ),
// ]
// .into_iter()
// .collect(),
// )));
// });
//}
#[test]
fn introspect_field_arg_with_default() {

32
juniper_codegen/src/util.rs
View file

@ -731,6 +731,20 @@ impl GraphQLTypeDefiniton {
}
});
let scalar = self
.scalar
.as_ref()
.map(|s| quote!( #s ))
.unwrap_or_else(|| {
if self.generic_scalar {
// If generic_scalar is true, we always insert a generic scalar.
// See more comments below.
quote!(__S)
} else {
quote!(#juniper_crate_name::DefaultScalarValue)
}
});
let resolve_matches = self.fields.iter().map(|field| {
let name = &field.name;
let code = &field.resolver_code;
@ -740,7 +754,7 @@ impl GraphQLTypeDefiniton {
#name => {
panic!("Tried to resolve async field {} on type {:?} with a sync resolver",
#name,
Self::name(_info)
<Self as #juniper_crate_name::GraphQLType<#scalar>>::name(_info)
);
},
)
@ -782,20 +796,6 @@ impl GraphQLTypeDefiniton {
)
});
let scalar = self
.scalar
.as_ref()
.map(|s| quote!( #s ))
.unwrap_or_else(|| {
if self.generic_scalar {
// If generic_scalar is true, we always insert a generic scalar.
// See more comments below.
quote!(__S)
} else {
quote!(#juniper_crate_name::DefaultScalarValue)
}
});
// Preserve the original type_generics before modification,
// since alteration makes them invalid if self.generic_scalar
// is specified.
@ -999,7 +999,7 @@ impl GraphQLTypeDefiniton {
_ => {
panic!("Field {} not found on type {:?}",
field,
Self::name(_info)
<Self as #juniper_crate_name::GraphQLType<#scalar>>::name(_info)
);
}
}