Fix CI

Author: mendess

.github/workflows/rust.yml

@@ -16,7 +16,5 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - uses: taiki-e/install-action@cargo-hack
-    - name: Build
-      run: cargo hack build --each-feature --verbose
     - name: Run tests
-      run: cargo hack test --each-feature --verbose
+      run: ./scripts/test-features.sh

scripts/test-features.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -ueo pipefail
+
+cargo metadata --format-version 1 | jq '.packages[] | select(.name == "scryfall") | .features | keys[]' -r | while read -r feature; do
+    cargo test --no-default-features --features "$feature,default-tls"
+done
+
+cargo test --all-features

src/card.rs

@@ -287,6 +287,9 @@ pub struct Card {
     /// the same name (tokens, Unstable variants, etc).
     pub oracle_id: Option<Uuid>,
 
+    /// This card’s Resource ID on Gatherer, if any.
+    pub resource_id: Option<String>,
+
     /// A link to where you can begin paginating all re/prints for this card on
     /// Scryfall’s API.
     pub prints_search_uri: Uri<List<Card>>,

src/search.rs

@@ -335,13 +335,20 @@ mod tests {
 
     #[tokio::test]
     async fn numeric_property_comparison_buffered() {
-        let card = Card::search_random(Query::And(vec![
-            power(eq(NumProperty::Toughness)),
-            pow_tou(eq(NumProperty::Cmc)),
-            not(CardIs::Funny),
-        ]))
-        .await
-        .unwrap();
+        let card = loop {
+            let card = Card::search_random(Query::And(vec![
+                power(eq(NumProperty::Toughness)),
+                pow_tou(eq(NumProperty::Cmc)),
+                not(CardIs::Funny),
+            ]))
+            .await
+            .unwrap();
+
+            // dfcs have don't have power and toughness on the top level card
+            if card.power.is_some() || card.toughness.is_some() {
+                break card;
+            }
+        };
 
         let power = card
             .power

tests/variants-feature/default_variants.rs

@@ -230,6 +230,12 @@ fn match_on_promo_type(f: PromoType) {
         PromoType::Vault => todo!(),
         PromoType::Wizardsplaynetwork => todo!(),
         PromoType::DragonScaleFoil => todo!(),
+        PromoType::Beginnerbox => todo!(),
+        PromoType::Manafoil => todo!(),
+        PromoType::Resale => todo!(),
+        PromoType::Sldbonus => todo!(),
+        PromoType::Sourcematerial => todo!(),
+        PromoType::Startercollection => todo!(),
         _ => todo!(),
     }
 }

tests/variants-feature/unknown_variants.rs

@@ -211,6 +211,7 @@ fn match_on_promo_type(f: PromoType) {
         PromoType::Silverfoil => todo!(),
         PromoType::Singularityfoil => todo!(),
         PromoType::Sldbonus => todo!(),
+        PromoType::Sourcematerial => todo!(),
         PromoType::Stamped => todo!(),
         PromoType::Startercollection => todo!(),
         PromoType::Starterdeck => todo!(),

tests/variants-feature/unknown_variants_slim.rs

@@ -217,6 +217,7 @@ fn match_on_promo_type(f: PromoType) {
         PromoType::Silverfoil => todo!(),
         PromoType::Singularityfoil => todo!(),
         PromoType::Sldbonus => todo!(),
+        PromoType::Sourcematerial => todo!(),
         PromoType::Stamped => todo!(),
         PromoType::Startercollection => todo!(),
         PromoType::Starterdeck => todo!(),