Fix default feature flags enabled count

Author: GuillaumeGomez

src/web/features.rs

@@ -116,6 +116,13 @@ impl FeaturesPage {
     pub(crate) fn use_direct_platform_links(&self) -> bool {
         true
     }
+
+    pub(crate) fn nb_enabled_default_features(&self) -> usize {
+        self.default_features
+            .iter()
+            .filter(|f| !f.starts_with("dep:") && *f != "default" && !f.contains('/'))
+            .count()
+    }
 }
 
 pub(crate) async fn build_features_handler(
@@ -231,6 +238,7 @@ fn get_sorted_features(raw_features: Vec<DbFeature>) -> (Vec<Feature>, HashSet<S
 mod tests {
     use super::*;
     use crate::test::{AxumResponseTestExt, AxumRouterTestExt, async_wrapper};
+    use kuchikiki::traits::TendrilSink;
     use reqwest::StatusCode;
 
     #[test]
@@ -461,4 +469,46 @@ mod tests {
             Ok(())
         });
     }
+
+    // This test ensures that the count of feature flags is correct, in particular the count of
+    // features enabled by default.
+    #[test]
+    fn test_features_count() {
+        async_wrapper(|env| async move {
+            let features = vec![
+                (
+                    "default".to_owned(),
+                    vec![
+                        "bla".to_owned(),
+                        "dep:what".to_owned(),
+                        "whatever/wut".to_owned(),
+                    ],
+                ),
+                ("bla".to_owned(), vec![]),
+                ("blob".to_owned(), vec![]),
+            ];
+            env.fake_release()
+                .await
+                .name("foo")
+                .version("0.1.0")
+                .features(features.into_iter().collect::<HashMap<_, _>>())
+                .create()
+                .await?;
+
+            let web = env.web_app().await;
+
+            let page = kuchikiki::parse_html()
+                .one(web.get("/crate/foo/0.1.0/features").await?.text().await?);
+            let text = page.select_first("#main > p").unwrap().text_contents();
+            // It should only contain one feature enabled by default since the others are either
+            // enabling a dependency (`dep:what`) or enabling a feature from a dependency
+            // (`whatever/wut`).
+            assert_eq!(
+                text,
+                "This version has 3 feature flags, 1 of them enabled by default."
+            );
+
+            Ok(())
+        });
+    }
 }

templates/crate/features.html

@@ -39,7 +39,7 @@
                                     </li>
                                 {%- endfor %}
                             {%- endif -%}
-                        {%- else %}
+                        {%- else -%}
                             <li class="pure-menu-item">
                                 <span class="documented-info">
                                     Feature flags are not available for this release because the build failed before we could retrieve them,
@@ -65,7 +65,7 @@ <h1>{{ metadata.name }}</h1>
                     {%- if features.is_empty() -%}
                         <p data-id="empty-features">This release does not have any feature flags.</p>
                     {%- else -%}
-                        <p>This version has <b>{{ features.len() }}</b> feature flags, <b data-id="default-feature-len">{{ default_features.len() }}</b> of them enabled by <b>default</b>.</p>
+                        <p>This version has <b>{{ features.len() }}</b> feature flags, <b data-id="default-feature-len">{{ nb_enabled_default_features() }}</b> of them enabled by <b>default</b>.</p>
                         {%- for feature in features -%}
                             {%- let is_default = feature.name != "default" && is_default_feature(feature.name) -%}
                             <h3 id="{{ feature.name }}">{{ feature.name }}{%- if is_default  %} (default){%- endif -%}</h3>
@@ -93,7 +93,7 @@ <h3 id="{{ feature.name }}">{{ feature.name }}{%- if is_default  %} (default){%-
                                                     /<a href="/crate/{{ dependency }}/{{ version }}/features#{{ feature }}">
                                                         {{- feature -}}
                                                     </a>
-                                            {% endmatch %}
+                                            {%- endmatch %}
                                             {%- if is_default %} <span class="is-default-feature">(default)</span>{%- endif -%}
                                         </li>
                                     {%- endfor -%}