Fix flaky unit test - remove 'Markup' object in data (#5313)

example of the failed test https://travis-ci.org/apache/incubator-superset/jobs/397891630
apache · Jul 2, 2018 · 16d2633 · 16d2633
1 parent 885d779
commit 16d2633
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/superset/assets/src/dashboard/actions/sliceEntities.js b/superset/assets/src/dashboard/actions/sliceEntities.js
@@ -56,9 +56,7 @@ export function fetchAllSlices(userId) {
                 description: slice.description,
                 description_markdown: slice.description_markeddown,
                 viz_type: slice.viz_type,
-                modified: slice.modified
-                  ? slice.modified.replace(/<[^>]*>/g, '')
-                  : '',
+                modified: slice.modified,
               };
             }
           });

diff --git a/superset/assets/src/dashboard/components/dnd/AddSliceDragPreview.jsx b/superset/assets/src/dashboard/components/dnd/AddSliceDragPreview.jsx
@@ -54,9 +54,7 @@ function AddSliceDragPreview({ dragItem, slices, isDragging, currentOffset }) {
         transform: `translate(${currentOffset.x}px, ${currentOffset.y}px)`,
       }}
       sliceName={slice.slice_name}
-      lastModified={
-        slice.modified ? slice.modified.replace(/<[^>]*>/g, '') : ''
-      }
+      lastModified={slice.modified}
       visType={slice.viz_type}
       datasourceLink={slice.datasource_link}
     />

diff --git a/superset/assets/src/dashboard/reducers/getInitialState.js b/superset/assets/src/dashboard/reducers/getInitialState.js
@@ -92,7 +92,7 @@ export default function(bootstrapData) {
         datasource: slice.form_data.datasource,
         description: slice.description,
         description_markeddown: slice.description_markeddown,
-        modified: slice.modified ? slice.modified.replace(/<[^>]*>/g, '') : '',
+        modified: slice.modified,
         changed_on: new Date(slice.changed_on).getTime(),
       };
 

diff --git a/superset/models/helpers.py b/superset/models/helpers.py
@@ -282,8 +282,7 @@ def changed_on_(self):
 
     @renders('modified')
     def modified(self):
-        s = humanize.naturaltime(datetime.now() - self.changed_on)
-        return Markup('<span class="no-wrap">{}</span>'.format(s))
+        return humanize.naturaltime(datetime.now() - self.changed_on)
 
     @property
     def icons(self):