Merge branch 'rs-groups-index' into 'master'

Make the `/groups` route behave as expected The route is supposed to redirect the Groups#index request based on whether or not a user was logged in. If they are, we redirect them to their groups dashboard; if they're not, we redirect them to the public Explore page. But due to overly aggressive `before_action`s that weren't excluding (or including) the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660 See merge request !2580

Merge branch 'rs-groups-index' into 'master'
28e2d214 · Douwe Maan · eb7f6690 · a7c4d0da · 28e2d214 · 28e2d214
Commit 28e2d214 authored Jan 26, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 28 additions and 4 deletions

groups_controller.rb app/controllers/groups_controller.rb +5 -4

groups_controller_spec.rb spec/controllers/groups_controller_spec.rb +23 -0

No files found.
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -2,17 +2,18 @@ class GroupsController < Groups::ApplicationController
  include IssuesAction
  include MergeRequestsAction
-  skip_before_action :authenticate_user!, only: [:show, :issues, :merge_requests]
  respond_to :html
-  before_action :group, except: [:new, :create]
+  skip_before_action :authenticate_user!, only: [:index, :show, :issues, :merge_requests]
+  before_action :group, except: [:index, :new, :create]
  # Authorize
-  before_action :authorize_read_group!, except: [:show, :new, :create, :autocomplete]
+  before_action :authorize_read_group!, except: [:index, :show, :new, :create, :autocomplete]
  before_action :authorize_admin_group!, only: [:edit, :update, :destroy, :projects]
  before_action :authorize_create_group!, only: [:new, :create]
  # Load group projects
-  before_action :load_projects, except: [:new, :create, :projects, :edit, :update, :autocomplete]
+  before_action :load_projects, except: [:index, :new, :create, :projects, :edit, :update, :autocomplete]
  before_action :event_filter, only: :show
  layout :determine_layout

--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
+require 'rails_helper'
+describe GroupsController do
+  describe 'GET index' do
+    context 'as a user' do
+      it 'redirects to Groups Dashboard' do
+        sign_in(create(:user))
+        get :index
+        expect(response).to redirect_to(dashboard_groups_path)
+      end
+    end
+    context 'as a guest' do
+      it 'redirects to Explore Groups' do
+        get :index
+        expect(response).to redirect_to(explore_groups_path)
+      end
+    end
+  end
+end