Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKushal Pandya <kushalspandya@gmail.com>2019-04-11 13:17:39 +0300
committerKushal Pandya <kushalspandya@gmail.com>2019-04-11 13:17:39 +0300
commit423f82d41125ef2a6bfafb0d963dafd52ba656db (patch)
tree2d14c9153f1b06d16f37c427c511f2906ed8c1ef /spec/features
parent51119395e668d592d69266cf74dcb67b667082a8 (diff)
parent1d04ae7458bec082a2f82d0776f89e297719f23c (diff)
Merge branch 'fixed-web-ide-merge-request-review' into 'master'
Fixes Web IDE not loading merge request files Closes #60243 See merge request gitlab-org/gitlab-ce!27225
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/ide/user_opens_merge_request_spec.rb21
1 files changed, 21 insertions, 0 deletions
diff --git a/spec/features/ide/user_opens_merge_request_spec.rb b/spec/features/ide/user_opens_merge_request_spec.rb
new file mode 100644
index 00000000000..185349219a7
--- /dev/null
+++ b/spec/features/ide/user_opens_merge_request_spec.rb
@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe 'IDE merge request', :js do
+ let(:merge_request) { create(:merge_request, :with_diffs, :simple, source_project: project) }
+ let(:project) { create(:project, :public, :repository) }
+ let(:user) { project.owner }
+
+ before do
+ sign_in(user)
+
+ visit(merge_request_path(merge_request))
+ end
+
+ it 'user opens merge request' do
+ click_link 'Open in Web IDE'
+
+ wait_for_requests
+
+ expect(page).to have_selector('.monaco-diff-editor')
+ end
+end