summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-05-04 08:54:42 +0100
committerPhil Hughes <me@iamphill.com>2017-05-04 08:54:42 +0100
commitfdacc4ee6a3341b2c44ddd85a41f2a04d0d417ad (patch)
tree337451ec4cf566000b15a8a04212849a0e18a5a7
parent9ee274c03166b5773d433e3947b5d566fda02e53 (diff)
downloadgitlab-ce-tags-sort-default.tar.gz
Moved to a view spectags-sort-default
-rw-r--r--app/views/projects/tags/index.html.haml1
-rw-r--r--spec/features/projects/tags/sort_spec.rb15
-rw-r--r--spec/views/projects/tags/index.html.haml_spec.rb20
3 files changed, 21 insertions, 15 deletions
diff --git a/app/views/projects/tags/index.html.haml b/app/views/projects/tags/index.html.haml
index c14bbf4f05f..56656ea3d86 100644
--- a/app/views/projects/tags/index.html.haml
+++ b/app/views/projects/tags/index.html.haml
@@ -1,4 +1,5 @@
- @no_container = true
+- @sort ||= sort_value_recently_updated
- page_title "Tags"
= render "projects/commits/head"
diff --git a/spec/features/projects/tags/sort_spec.rb b/spec/features/projects/tags/sort_spec.rb
deleted file mode 100644
index 835cd1507fb..00000000000
--- a/spec/features/projects/tags/sort_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-feature 'Tags sort dropdown', :feature do
- let(:project) { create(:project) }
-
- before do
- login_as(:admin)
-
- visit namespace_project_tags_path(project.namespace, project)
- end
-
- it 'defaults sort dropdown to last updated' do
- expect(page).to have_button('Last updated')
- end
-end
diff --git a/spec/views/projects/tags/index.html.haml_spec.rb b/spec/views/projects/tags/index.html.haml_spec.rb
new file mode 100644
index 00000000000..33122365e9a
--- /dev/null
+++ b/spec/views/projects/tags/index.html.haml_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe 'projects/tags/index', :view do
+ let(:project) { create(:project) }
+
+ before do
+ assign(:project, project)
+ assign(:repository, project.repository)
+ assign(:tags, [])
+
+ allow(view).to receive(:current_ref).and_return('master')
+ allow(view).to receive(:can?).and_return(false)
+ end
+
+ it 'defaults sort dropdown toggle to last updated' do
+ render
+
+ expect(rendered).to have_button('Last updated')
+ end
+end