diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-12-27 20:41:04 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-12-27 20:41:04 +0000 |
| commit | 2ed90c454d91ab2672f52a9760974aa8f0991539 (patch) | |
| tree | c5420859e15ead270c30b60e0f967f9772cc6686 /spec | |
| parent | ae51027da0f89bc98b9cd39e61c9e51d8da23add (diff) | |
| parent | 75060b93a6ea958b0c61a3c276d009026eef9dbd (diff) | |
| download | gitlab-ce-2ed90c454d91ab2672f52a9760974aa8f0991539.tar.gz | |
Merge branch '18786-go-to-a-project-order' into 'master'
Go to a project order
Closes #18786
See merge request !7737
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/fixtures/project_title.html.haml | 2 | ||||
| -rw-r--r-- | spec/javascripts/project_title_spec.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/spec/javascripts/fixtures/project_title.html.haml b/spec/javascripts/fixtures/project_title.html.haml index 4547feeb212..9d1f7877116 100644 --- a/spec/javascripts/fixtures/project_title.html.haml +++ b/spec/javascripts/fixtures/project_title.html.haml @@ -4,7 +4,7 @@ GitLab Org %a.project-item-select-holder{href: "/gitlab-org/gitlab-test"} GitLab Test - %i.fa.chevron-down.dropdown-toggle-caret.js-projects-dropdown-toggle{ "data-toggle" => "dropdown", "data-target" => ".header-content" } + %i.fa.chevron-down.dropdown-toggle-caret.js-projects-dropdown-toggle{ "data-toggle" => "dropdown", "data-target" => ".header-content", "data-order-by" => "last_activity_at" } .js-dropdown-menu-projects .dropdown-menu.dropdown-select.dropdown-menu-projects .dropdown-title diff --git a/spec/javascripts/project_title_spec.js b/spec/javascripts/project_title_spec.js index bb802a4b5e3..216b77f37c0 100644 --- a/spec/javascripts/project_title_spec.js +++ b/spec/javascripts/project_title_spec.js @@ -26,6 +26,7 @@ var fakeAjaxResponse = function fakeAjaxResponse(req) { var d; expect(req.url).toBe('/api/v3/projects.json?simple=true'); + expect(req.data).toEqual({ search: '', order_by: 'last_activity_at', per_page: 20 }); d = $.Deferred(); d.resolve(this.projects_data); return d.promise(); |