summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-08-10 18:36:39 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-08-10 18:36:39 +0100
commitea448039c8954e5a1d175f827b0205754dfb6dd2 (patch)
tree9803a0c8eb63d65e69e19c29c599d3edf7c9637a /spec
parent57f52b9e53a5ddf56d2331dd740870d9bbdc00eb (diff)
downloadgitlab-ce-ea448039c8954e5a1d175f827b0205754dfb6dd2.tar.gz
Fix broken tests
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/notes/components/issue_discussion_spec.js21
-rw-r--r--spec/javascripts/zen_mode_spec.js2
2 files changed, 22 insertions, 1 deletions
diff --git a/spec/javascripts/notes/components/issue_discussion_spec.js b/spec/javascripts/notes/components/issue_discussion_spec.js
index 9bc1ec37250..85fea7a0c37 100644
--- a/spec/javascripts/notes/components/issue_discussion_spec.js
+++ b/spec/javascripts/notes/components/issue_discussion_spec.js
@@ -1,5 +1,26 @@
+import Vue from 'vue';
+import store from '~/notes/stores';
+import issueDiscussion from '~/notes/components/issue_discussion.vue';
+import { issueDataMock, discussionMock } from '../mock_data';
+
describe('issue_discussion component', () => {
+ let vm;
+
+ beforeEach(() => {
+ const Component = Vue.extend(issueDiscussion);
+
+ store.dispatch('setIssueData', issueDataMock);
+
+ vm = new Component({
+ store,
+ propsData: {
+ note: discussionMock,
+ },
+ }).$mount();
+ });
+
it('should render user avatar', () => {
+ console.log('vm', vm.$el);
});
diff --git a/spec/javascripts/zen_mode_spec.js b/spec/javascripts/zen_mode_spec.js
index a225b04c47e..bd18f79cea7 100644
--- a/spec/javascripts/zen_mode_spec.js
+++ b/spec/javascripts/zen_mode_spec.js
@@ -8,7 +8,7 @@ import ZenMode from '~/zen_mode';
var enterZen, escapeKeydown, exitZen;
describe('ZenMode', function() {
- var fixtureName = 'issues/open-issue.html.raw';
+ var fixtureName = 'merge_requests/merge_request_with_comment.html.raw';
preloadFixtures(fixtureName);
beforeEach(function() {
loadFixtures(fixtureName);