fix: for test

screwdriver-cd · Aug 4, 2020 · 4da0662 · 4da0662
1 parent 7c97a1b
commit 4da0662
Show file tree

Hide file tree

Showing 11 changed files with 423 additions and 758 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/app/components/build-log/component.js b/app/components/build-log/component.js
@@ -260,7 +260,7 @@ export default Component.extend({
    * @method scrollTop
    */
   scrollTop() {
-    this.$('.wrap')[0].scrollTop = 0;
+    this.element.querySelectorAll('.wrap')[0].scrollTop = 0;
   },
 
   /**
@@ -269,9 +269,9 @@ export default Component.extend({
    */
   scrollDown() {
     if (this.autoscroll) {
-      const bottom = this.$('.bottom').prop('offsetTop');
+      const bottom = this.element.querySelector('.bottom').offsetTop;
 
-      this.$('.wrap').prop('scrollTop', bottom);
+      this.element.querySelector('.wrap').scrollTop = bottom;
       set(this, 'lastScrollTop', bottom);
     }
   },
@@ -281,7 +281,7 @@ export default Component.extend({
    * @method scrollStill
    */
   scrollStill() {
-    const container = this.$('.wrap')[0];
+    const container = this.element.querySelectorAll('.wrap')[0];
 
     set(
       this,
@@ -321,7 +321,7 @@ export default Component.extend({
         .then(({ done }) => {
           // prevent updating logs when component is being destroyed
           if (!this.isDestroyed && !this.isDestroying) {
-            const container = this.$('.wrap')[0];
+            const container = this.element.querySelectorAll('.wrap')[0];
             const { inProgress, justFinished } = this;
 
             set(this, 'isFetching', false);
@@ -370,18 +370,19 @@ export default Component.extend({
         set(this, 'isDownloading', true);
 
         this.getLogs(true).then(() => {
-          this.$('#downloadLink')
-            .attr({
-              download: `${buildId}-${stepName}.log`,
-              href: this.logService.buildLogBlobUrl(buildId, stepName)
-            })[0]
-            .click();
+          const el = this.element.querySelectorAll('#downloadLink');
+
+          el.forEach(e => {
+            e.setAttribute('download', `${buildId}-${stepName}.log`);
+            e.setAttribute('href', this.logService.buildLogBlobUrl(buildId, stepName));
+          });
+          el[0].click();
           set(this, 'isDownloading', false);
         });
       }
     },
     logScroll() {
-      const container = this.$('.wrap')[0];
+      const container = this.element.querySelectorAll('.wrap')[0];
 
       if (
         !this.inProgress &&
@@ -395,7 +396,11 @@ export default Component.extend({
       }
 
       // autoscroll when the bottom of the logs is roughly in view
-      set(this, 'autoscroll', this.$('.bottom')[0].getBoundingClientRect().top < 1500);
+      set(
+        this,
+        'autoscroll',
+        this.element.querySelectorAll('.bottom')[0].getBoundingClientRect().top < 1500
+      );
     },
     toggleTimeDisplay() {
       let index = timeTypes.indexOf(this.timeFormat);

diff --git a/app/components/pipeline-list-view/component.js b/app/components/pipeline-list-view/component.js
@@ -150,17 +150,14 @@ export default Component.extend({
 
       let startTime;
 
-      let status;
-
       let buildId;
 
       let coverageData = {};
 
       if (latestBuild) {
         startTime = moment(latestBuild.startTime).format('lll');
-        status = latestBuild.status;
         buildId = latestBuild.id;
-        duration = this.getDuration(latestBuild.startTime, latestBuild.endTime, status);
+        duration = this.getDuration(latestBuild.startTime, latestBuild.endTime, latestBuild.status);
 
         coverageData = {
           jobId,

diff --git a/app/components/pipeline-list-view/template.hbs b/app/components/pipeline-list-view/template.hbs
@@ -1,5 +1,5 @@
 <button {{action "refreshListViewJobs"}} class="refresh-btn">Refresh</button>
-{{#light-table table as |t|}}
+{{#light-table table height="inherit" as |t|}}
   {{t.head
     onColumnClick=(action "onColumnClick")
     iconSortable="fa fa-sort"

diff --git a/app/components/tc-collection-list/component.js b/app/components/tc-collection-list/component.js
@@ -104,7 +104,7 @@ export default Component.extend({
         .sort();
     }
   }),
-  columns: computed(function() {
+  columns: computed(function columns() {
     return [
       {
         label: 'Name',

diff --git a/app/styles/app.scss b/app/styles/app.scss
@@ -178,3 +178,5 @@ body {
 }
 
 @import 'ember-power-select';
+
+@import 'ember-bootstrap/bootstrap';
diff --git a/config/environment.js b/config/environment.js
@@ -13,6 +13,7 @@ module.exports = environment => {
         // Glimmer [ember] and ACE Editor [validator] add styles to elements at run time, this makes it impossible to precalculate all possible shas for inline styles
         "'unsafe-inline'"
       ],
+      'script-src': ["'unsafe-eval'"],
       'manifest-src': ["'self'"],
       'frame-src': ["'self'"],
       'connect-src': ["'self'"],