summaryrefslogtreecommitdiff
path: root/spec/javascripts/vue_shared/components
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-07-16 21:33:49 +0100
committerFilipa Lacerda <filipa@gitlab.com>2018-07-16 21:33:49 +0100
commitcf9a0f2891e81b5142665c75ee9fd15ff7e55e69 (patch)
treeb1561d68e58de07098817e615fdd706015bbc476 /spec/javascripts/vue_shared/components
parentcd1b20ae93738b61f0aa074460e2b62b03c1e938 (diff)
parent7f0431dd8550ac9d229d1383c03386c1634d015f (diff)
downloadgitlab-ce-cf9a0f2891e81b5142665c75ee9fd15ff7e55e69.tar.gz
[ci skip] Merge branch 'master' into 45318-FE-junit-tests
* master: (49 commits) Add changelog entry Fix `transform` typo Fix archived parameter for projects API Enable frozen string in apps/uploaders/*.rb Fix invalid link to GitLab.com architecture.md i18n: externalize strings from 'app/views/import' Remove Repository#lookup and unreachable rugged code refactor code based on feedback Trigger rails5 tests either by variable or ref name Fix link in help doc which was linking to old mono-repo, now in its own repo SubmoduleHelper - Project is not always available as an instance variable Allow Danger step to fail update webpack to v4.16 Backport logger changes from EE Add the CI Job trigger as the build trigger Remove flaky and redundant expectations use fileuploader dynamic path method in uploads manager and add spec fix typo in uploads manager add small comment to download method in uploads manager refactor uploads manager ...
Diffstat (limited to 'spec/javascripts/vue_shared/components')
-rw-r--r--spec/javascripts/vue_shared/components/memory_graph_spec.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/vue_shared/components/memory_graph_spec.js b/spec/javascripts/vue_shared/components/memory_graph_spec.js
index 73a69df019e..65d8ed39ade 100644
--- a/spec/javascripts/vue_shared/components/memory_graph_spec.js
+++ b/spec/javascripts/vue_shared/components/memory_graph_spec.js
@@ -113,7 +113,7 @@ describe('MemoryGraph', () => {
const circleEl = el.querySelector('circle');
expect(circleEl).toBeDefined();
expect(circleEl.getAttribute('r')).toBe('1.5');
- expect(circleEl.getAttribute('tranform')).toBe('translate(0 -1)');
+ expect(circleEl.getAttribute('transform')).toBe('translate(0 -1)');
expect(circleEl.getAttribute('cx')).toBe(`${dotX}`);
expect(circleEl.getAttribute('cy')).toBe(`${dotY}`);
done();