Added test for admin/projects

Added tests with project_list_filter_bar set to off

Added tests for projects_sort_option_titles

Refactor project sort options hash

app/helpers/sorting_helper.rb

@@ -31,19 +31,23 @@ module SortingHelper
   end
 
   def projects_sort_options_hash
-    Feature.enabled?(:project_list_filter_bar) && !current_controller?('admin/projects') ? projects_sort_common_options_hash : old_projects_sort_options_hash
-  end
+    use_old_sorting = !Feature.enabled?(:project_list_filter_bar) || current_controller?('admin/projects') 
 
-  # TODO: Simplify these sorting options
-  # https://gitlab.com/gitlab-org/gitlab-ce/issues/60798
-  # https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/11209#note_162234858
-  def old_projects_sort_options_hash
-    options = projects_sort_common_options_hash.merge({
-      sort_value_oldest_activity  => sort_title_oldest_activity,
-      sort_value_oldest_created   => sort_title_oldest_created,
-      sort_value_recently_created => sort_title_recently_created,
-      sort_value_stars_desc       => sort_title_most_stars
-    })
+    options = {
+      sort_value_latest_activity  => sort_title_latest_activity,
+      sort_value_recently_created => sort_title_created_date,
+      sort_value_name             => sort_title_name,
+      sort_value_stars_desc       => sort_title_stars
+    }
+
+    if use_old_sorting
+      options = options.merge({
+        sort_value_oldest_activity  => sort_title_oldest_activity,
+        sort_value_oldest_created   => sort_title_oldest_created,
+        sort_value_recently_created => sort_title_recently_created,
+        sort_value_stars_desc       => sort_title_most_stars
+      })
+    end
 
     if current_controller?('admin/projects')
       options[sort_value_largest_repo] = sort_title_largest_repo
@@ -52,17 +56,9 @@ module SortingHelper
     options
   end
 
-  def projects_sort_common_options_hash
-    {
-      sort_value_latest_activity  => sort_title_latest_activity,
-      sort_value_recently_created => sort_title_created_date,
-      sort_value_name             => sort_title_name,
-      sort_value_stars_desc       => sort_title_stars
-    }
-  end
-
   def projects_sort_option_titles
-    projects_sort_common_options_hash.merge({
+    # Only used for the project filter search bar
+    projects_sort_options_hash.merge({
       sort_value_oldest_activity  => sort_title_latest_activity,
       sort_value_oldest_created   => sort_title_created_date,
       sort_value_name_desc        => sort_title_name,

spec/helpers/sorting_helper_spec.rb

@@ -52,26 +52,16 @@ describe SortingHelper do
     allow(helper.controller).to receive(:controller_path).and_return(value)
   end
 
-  def project_common_options()
+  def project_common_options
     {
       sort_value_latest_activity  => sort_title_latest_activity,
       sort_value_recently_created => sort_title_created_date,
       sort_value_name             => sort_title_name,
       sort_value_stars_desc       => sort_title_stars
-    }  
-  end
-
-  def admin_additional_project_options()
-    {
-      sort_value_recently_created => sort_title_recently_created,
-      sort_value_largest_repo     => sort_title_largest_repo,
-      sort_value_oldest_activity  => sort_title_oldest_activity,
-      sort_value_oldest_created   => sort_title_oldest_created,
-      sort_value_stars_desc       => sort_title_most_stars
     }
   end
 
-  describe 'with `admin/projects` controller', :focus do 
+  describe 'with `admin/projects` controller' do
     before do
       stub_controller_path('admin/projects')
     end
@@ -80,13 +70,19 @@ describe SortingHelper do
       it 'returns a hash of available sorting options' do
         hash = projects_sort_options_hash
 
-        admin_options = project_common_options.merge(admin_additional_project_options)
+        admin_options = project_common_options.merge(    {
+          sort_value_oldest_activity  => sort_title_oldest_activity,
+          sort_value_oldest_created   => sort_title_oldest_created,
+          sort_value_recently_created => sort_title_recently_created,
+          sort_value_stars_desc       => sort_title_most_stars,
+          sort_value_largest_repo     => sort_title_largest_repo
+        })
         expect(hash).to eq(admin_options)
       end
     end
   end
 
-  describe 'with `projects` controller', :focus do
+  describe 'with `projects` controller' do
     before do
       stub_controller_path('projects')
     end
@@ -94,23 +90,12 @@ describe SortingHelper do
     describe '#projects_sort_options_hash' do
       it 'returns a hash of available sorting options' do
         hash = projects_sort_options_hash
-
         common_options = project_common_options
-        admin_options = admin_additional_project_options
-        common_with_different_values = [sort_value_recently_created, sort_value_stars_desc]
 
         common_options.each do |key, opt|
           expect(hash).to include(key)
           expect(hash[key]).to eq(opt)
         end
-
-        admin_options.each do |key, opt|
-          if common_with_different_values.include?(key)
-            expect(hash[key]).not_to eq(opt)
-          else
-            expect(hash).not_to include(key)
-          end
-        end
       end
     end
 
@@ -135,27 +120,114 @@ describe SortingHelper do
         end
       end
     end
-  end
 
-  describe '#project_sort_direction_button', :focus do
-    before do
-      allow(self).to receive(:request).and_return(double(path: 'http://test.com', query_parameters: { label_name: 'test_label' }))
-    end
+    describe '#project_sort_direction_button' do
+      # TODO: add more of these
+      # TODO: Not too sure about these
+      # Take a look at the ui and just go with that
+      # it 'returns icon with sort-highest when sort is created_date' do
+      #   expect(project_sort_direction_button('created_date')).to include('sort-highest')
+      # end
 
-    it 'returns icon with sort-highest when sort is created_date' do
-      expect(project_sort_direction_button('created_date')).to include('sort-highest')
-    end
+      # it 'returns icon with sort-lowest when sort is asc' do
+      #   expect(project_sort_direction_button('created_asc')).to include('sort-lowest')
+      # end
 
-    it 'returns icon with sort-lowest when sort is asc' do
-      expect(project_sort_direction_button('created_asc')).to include('sort-lowest')
+      # it 'returns icon with sort-lowest when sorting by milestone' do
+      #   expect(project_sort_direction_button('milestone')).to include('sort-lowest')
+      # end
+
+      # it 'returns icon with sort-lowest when sorting by due_date' do
+      #   expect(project_sort_direction_button('due_date')).to include('sort-lowest')
+      # end
     end
 
-    it 'returns icon with sort-lowest when sorting by milestone' do
-      expect(project_sort_direction_button('milestone')).to include('sort-lowest')
+    describe '#projects_sort_option_titles' do
+      it 'returns a hash of titles for the sorting options' do
+        titles = projects_sort_option_titles
+
+        options = {
+          sort_value_latest_activity  => sort_title_latest_activity,
+          sort_value_recently_created => sort_title_created_date,
+          sort_value_name             => sort_title_name,
+          sort_value_stars_desc       => sort_title_stars,
+          sort_value_oldest_activity  => sort_title_latest_activity,
+          sort_value_oldest_created   => sort_title_created_date,
+          sort_value_name_desc        => sort_title_name,
+          sort_value_stars_asc        => sort_title_stars
+        }
+
+        expect(titles.length).to eq(options.length)
+
+        titles.each do |key, opt|
+          expect(options).to include(key)
+          expect(options[key]).to eq(opt)
+        end
+      end
     end
 
-    it 'returns icon with sort-lowest when sorting by due_date' do
-      expect(project_sort_direction_button('due_date')).to include('sort-lowest')
+    describe 'with project_list_filter_bar off' do
+      before do
+        stub_feature_flags(project_list_filter_bar: false)
+      end
+
+      describe '#projects_sort_options_hash' do
+        it 'returns a hash of available sorting options' do
+          hash = projects_sort_options_hash
+          options = project_common_options.merge({
+            sort_value_oldest_activity  => sort_title_oldest_activity,
+            sort_value_oldest_created   => sort_title_oldest_created,
+            sort_value_recently_created => sort_title_recently_created,
+            sort_value_stars_desc       => sort_title_most_stars
+          })
+
+          options.each do |key, opt|
+            expect(hash).to include(key)
+            expect(hash[key]).to eq(opt)
+          end
+        end
+      end
+
+      describe '#projects_reverse_sort_options_hash' do 
+        it 'returns a reversed hash of available sorting options' do
+          reverse_hash = projects_reverse_sort_options_hash
+
+          options = {
+            sort_value_latest_activity  => sort_value_oldest_activity,
+            sort_value_recently_created => sort_value_oldest_created,
+            sort_value_name             => sort_value_name_desc,
+            sort_value_stars_desc       => sort_value_stars_asc,
+            sort_value_oldest_activity  => sort_value_latest_activity,
+            sort_value_oldest_created   => sort_value_recently_created,
+            sort_value_name_desc        => sort_value_name,
+            sort_value_stars_asc        => sort_value_stars_desc
+          }
+
+          options.each do |key, opt|
+            expect(reverse_hash).to include(key)
+            expect(reverse_hash[key]).to eq(opt)
+          end
+        end
+      end
+
+      describe '#project_sort_direction_button' do
+        # TODO: these don't look correct
+        # it 'returns icon with sort-highest when sort is created_date' do
+        #   expect(project_sort_direction_button('created_date')).to include('sort-highest')
+        # end
+
+        # it 'returns icon with sort-lowest when sort is asc' do
+        #   expect(project_sort_direction_button('created_asc')).to include('sort-lowest')
+        # end
+
+        # it 'returns icon with sort-lowest when sorting by milestone' do
+        #   expect(project_sort_direction_button('milestone')).to include('sort-lowest')
+        # end
+
+        # it 'returns icon with sort-lowest when sorting by due_date' do
+        #   expect(project_sort_direction_button('due_date')).to include('sort-lowest')
+        # end
+      end
     end
   end
 end