diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-10-05 14:49:16 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-10-05 14:49:16 +0900 |
| commit | 88cc9d5294198cfa748d602236729abcd73f56a6 (patch) | |
| tree | 6eb5be9ed46ec720ba195702d80e166980868146 /spec/javascripts/fixtures | |
| parent | d6e22e83d1fe8ffaa71c3bcb7906731733a89f0e (diff) | |
| parent | 8921af39e74976e37e92c786bd957883110f6522 (diff) | |
| download | gitlab-ce-88cc9d5294198cfa748d602236729abcd73f56a6.tar.gz | |
Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
Diffstat (limited to 'spec/javascripts/fixtures')
| -rw-r--r-- | spec/javascripts/fixtures/merge_requests.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/javascripts/fixtures/merge_requests.rb b/spec/javascripts/fixtures/merge_requests.rb index 4bc2205e642..3fd16d76f51 100644 --- a/spec/javascripts/fixtures/merge_requests.rb +++ b/spec/javascripts/fixtures/merge_requests.rb @@ -41,6 +41,12 @@ describe Projects::MergeRequestsController, '(JavaScript fixtures)', type: :cont remove_repository(project) end + it 'merge_requests/merge_request_of_current_user.html.raw' do |example| + merge_request.update(author: admin) + + render_merge_request(example.description, merge_request) + end + it 'merge_requests/merge_request_with_task_list.html.raw' do |example| create(:ci_build, :pending, pipeline: pipeline) |