fixup! Fixes #38048 - Add rolling content views

Katello · Dec 10, 2024 · 5999d04 · 5999d04
1 parent 2127da6
commit 5999d04
Show file tree

Hide file tree

Showing 23 changed files with 481 additions and 14 deletions.
diff --git a/webpack/scenes/ContentViews/Copy/__tests__/contentViewCopyResult.fixtures.json b/webpack/scenes/ContentViews/Copy/__tests__/contentViewCopyResult.fixtures.json
@@ -1,6 +1,7 @@
 {
   "content_host_count": 0,
   "composite": false,
+  "rolling": false,
   "component_ids": [],
   "default": false,
   "version_count": 0,

diff --git a/webpack/scenes/ContentViews/Create/__tests__/contentViewCreateResult.fixtures.json b/webpack/scenes/ContentViews/Create/__tests__/contentViewCreateResult.fixtures.json
@@ -1,6 +1,7 @@
 {
   "content_host_count": 0,
   "composite": false,
+  "rolling": false,
   "component_ids": [],
   "default": false,
   "version_count": 0,

diff --git a/webpack/scenes/ContentViews/Delete/__tests__/CvData.fixtures.json b/webpack/scenes/ContentViews/Delete/__tests__/CvData.fixtures.json
@@ -14,6 +14,7 @@
   "results": [
     {
       "composite": false,
+      "rolling": false,
       "component_ids": [],
       "default": false,
       "version_count": 4,
@@ -258,4 +259,4 @@
       }
     }
   ]
-}
+}
diff --git a/webpack/scenes/ContentViews/Delete/__tests__/affectedHosts.fixtures.json b/webpack/scenes/ContentViews/Delete/__tests__/affectedHosts.fixtures.json
@@ -113,7 +113,8 @@
         "content_view": {
           "id": 20,
           "name": "cv3",
-          "composite": false
+          "composite": false,
+          "rolling": false
         },
         "lifecycle_environment": {
           "id": 2,
@@ -138,4 +139,4 @@
       }
     }
   ]
-}
+}
diff --git a/webpack/scenes/ContentViews/Delete/__tests__/cvDetails.fixtures.json b/webpack/scenes/ContentViews/Delete/__tests__/cvDetails.fixtures.json
@@ -1,6 +1,7 @@
 {
   "content_host_count": 1,
   "composite": false,
+  "rolling": false,
   "component_ids": [],
   "default": false,
   "version_count": 4,
@@ -245,4 +246,4 @@
   },
   "duplicate_repositories_to_publish": [],
   "errors": null
-}
+}
diff --git a/...nes/ContentViews/Details/ComponentContentViews/__tests__/compositeCVDetails.fixtures.json b/...nes/ContentViews/Details/ComponentContentViews/__tests__/compositeCVDetails.fixtures.json
@@ -1,6 +1,7 @@
 {
   "content_host_count": 0,
   "composite": true,
+  "rolling": false,
   "component_ids": [
     5,
     7
@@ -390,4 +391,4 @@
     "promote_or_remove_content_views": true
   },
   "errors": null
-}
+}
diff --git a/...ntViews/Details/ComponentContentViews/__tests__/publishedContentViewDetails.fixtures.json b/...ntViews/Details/ComponentContentViews/__tests__/publishedContentViewDetails.fixtures.json
@@ -1,6 +1,7 @@
 {
   "content_host_count": 0,
   "composite": false,
+  "rolling": false,
   "component_ids": [],
   "default": false,
   "version_count": 33,
@@ -210,4 +211,4 @@
   },
   "duplicate_repositories_to_publish": [],
   "errors": null
-}
+}
diff --git a/...cenes/ContentViews/Details/Filters/__tests__/contentViewErrataByDateDetails.fixtures.json b/...cenes/ContentViews/Details/Filters/__tests__/contentViewErrataByDateDetails.fixtures.json
@@ -7,6 +7,7 @@
   "updated_at": "2021-10-05 15:48:00 -0400",
   "content_view": {
     "composite": false,
+    "rolling": false,
     "component_ids": [],
     "default": false,
     "version_count": 4,

diff --git a/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErratumFilterDetails.fixtures.json b/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErratumFilterDetails.fixtures.json
@@ -7,6 +7,7 @@
     "updated_at": "2020-12-08 09:26:11 -0500",
     "content_view": {
         "composite": false,
+        "rolling": false,
         "component_ids": [],
         "default": false,
         "version_count": 0,

diff --git a/...es/ContentViews/Details/Filters/__tests__/cvFilterDetailModuleAffectedRepos.fixtures.json b/...es/ContentViews/Details/Filters/__tests__/cvFilterDetailModuleAffectedRepos.fixtures.json
@@ -7,6 +7,7 @@
   "updated_at": "2021-08-23 14:46:28 -0400",
   "content_view": {
     "composite": false,
+    "rolling": false,
     "component_ids": [],
     "default": false,
     "version_count": 4,

diff --git a/...enes/ContentViews/Details/Filters/__tests__/cvFilterDetailWithAffectedRepos.fixtures.json b/...enes/ContentViews/Details/Filters/__tests__/cvFilterDetailWithAffectedRepos.fixtures.json
@@ -7,6 +7,7 @@
   "updated_at": "2021-08-23 14:46:28 -0400",
   "content_view": {
     "composite": false,
+    "rolling": false,
     "component_ids": [],
     "default": false,
     "version_count": 4,

diff --git a/webpack/scenes/ContentViews/Details/Filters/__tests__/cvFilterFixutre.fixture.json b/webpack/scenes/ContentViews/Details/Filters/__tests__/cvFilterFixutre.fixture.json
@@ -19,6 +19,7 @@
       "updated_at": "2021-10-05 15:48:00 -0400",
       "content_view": {
         "composite": false,
+        "rolling": false,
         "component_ids": [],
         "default": false,
         "version_count": 4,
@@ -279,4 +280,4 @@
       ]
     }
   ]
-}
+}
diff --git a/...k/scenes/ContentViews/Details/Filters/__tests__/cvModuleStreamFilterDetails.fixtures.json b/...k/scenes/ContentViews/Details/Filters/__tests__/cvModuleStreamFilterDetails.fixtures.json
@@ -7,6 +7,7 @@
    "updated_at": "2021-02-23 10:09:24 -0500",
    "content_view": {
       "composite": false,
+      "rolling": false,
       "component_ids": [],
       "default": false,
       "version_count": 0,

diff --git a/webpack/scenes/ContentViews/Details/Filters/__tests__/cvPackageFilterDetail.fixtures.json b/webpack/scenes/ContentViews/Details/Filters/__tests__/cvPackageFilterDetail.fixtures.json
@@ -8,6 +8,7 @@
   "updated_at": "2021-03-31 12:59:12 -0400",
   "content_view": {
     "composite": false,
+    "rolling": false,
     "component_ids": [],
     "default": false,
     "version_count": 4,

diff --git a/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewRepoAdd.fixture.json b/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewRepoAdd.fixture.json
@@ -1,6 +1,7 @@
 {
   "content_host_count": 0,
   "composite": false,
+  "rolling": false,
   "component_ids": [],
   "default": false,
   "version_count": 0,

diff --git a/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js b/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js
@@ -86,6 +86,33 @@ test('Can edit text details such as name', async (done) => {
   act(done);
 });
 
+test('Page contains Regular CV type', async (done) => {
+  const getscope = nockInstance
+    .get(cvDetailsPath)
+    .query(true)
+    .reply(200, cvDetailData);
+
+  const { queryByText } = renderWithRedux(
+    withCVRoute(<ContentViewDetails />),
+    renderOptions,
+  );
+
+  // Wait for page to load
+  await patientlyWaitFor(() => {
+    expect(queryByText('Regular')).toBeInTheDocument();
+    expect(queryByText('Rolling')).not.toBeInTheDocument();
+    expect(queryByText('Composite')).not.toBeInTheDocument();
+    expect(queryByText('Versions')).toBeInTheDocument();
+    expect(queryByText('Filters')).toBeInTheDocument();
+    expect(queryByText('History')).toBeInTheDocument();
+    expect(queryByText('Repositories')).toBeInTheDocument();
+  });
+
+  assertNockRequest(getscope);
+  act(done);
+});
+
+
 test('Can edit boolean details such as solve dependencies', async (done) => {
   const updatedCVDetails = { ...cvDetailData, solve_dependencies: true };
   const getscope = nockInstance

diff --git a/webpack/scenes/ContentViews/Details/__tests__/contentViewDetails.fixtures.json b/webpack/scenes/ContentViews/Details/__tests__/contentViewDetails.fixtures.json
@@ -1,6 +1,7 @@
 {
   "content_host_count": 0,
   "composite": false,
+  "rolling": false,
   "component_ids": [],
   "default": false,
   "version_count": 5,