diff options
| -rw-r--r-- | app/controllers/concerns/group_tree.rb | 2 | ||||
| -rw-r--r-- | app/views/shared/groups/_dropdown.html.haml | 1 | ||||
| -rw-r--r-- | features/explore/groups.feature | 12 | ||||
| -rw-r--r-- | spec/controllers/groups_controller_spec.rb | 1 | ||||
| -rw-r--r-- | spec/models/project_spec.rb | 1 | ||||
| -rw-r--r-- | spec/serializers/group_child_serializer_spec.rb | 1 |
6 files changed, 13 insertions, 5 deletions
diff --git a/app/controllers/concerns/group_tree.rb b/app/controllers/concerns/group_tree.rb index f4e1ce31dde..71223b59808 100644 --- a/app/controllers/concerns/group_tree.rb +++ b/app/controllers/concerns/group_tree.rb @@ -7,7 +7,7 @@ module GroupTree # Only show root groups if no parent-id is given groups.where(parent_id: params[:parent_id]) end - @groups = @groups.with_selects_for_list + @groups = @groups.with_selects_for_list(params[:archived]) .sort(@sort = params[:sort]) .page(params[:page]) diff --git a/app/views/shared/groups/_dropdown.html.haml b/app/views/shared/groups/_dropdown.html.haml index 355b03e4d9e..e8214f63e6d 100644 --- a/app/views/shared/groups/_dropdown.html.haml +++ b/app/views/shared/groups/_dropdown.html.haml @@ -6,7 +6,6 @@ - else - default_sort_by = sort_value_recently_created - .dropdown.inline.js-group-filter-dropdown-wrap.append-right-10 %button.dropdown-toggle{ type: 'button', 'data-toggle' => 'dropdown' } %span.dropdown-label diff --git a/features/explore/groups.feature b/features/explore/groups.feature index 9eacbe0b25e..830810615e0 100644 --- a/features/explore/groups.feature +++ b/features/explore/groups.feature @@ -3,6 +3,7 @@ Feature: Explore Groups Background: Given group "TestGroup" has private project "Enterprise" + @javascript Scenario: I should see group with private and internal projects as user Given group "TestGroup" has internal project "Internal" When I sign in as a user @@ -10,6 +11,7 @@ Feature: Explore Groups Then I should see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group issues for internal project as user Given group "TestGroup" has internal project "Internal" When I sign in as a user @@ -17,6 +19,7 @@ Feature: Explore Groups Then I should see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group merge requests for internal project as user Given group "TestGroup" has internal project "Internal" When I sign in as a user @@ -24,6 +27,7 @@ Feature: Explore Groups Then I should see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group with private, internal and public projects as visitor Given group "TestGroup" has internal project "Internal" Given group "TestGroup" has public project "Community" @@ -32,6 +36,7 @@ Feature: Explore Groups And I should not see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group issues for public project as visitor Given group "TestGroup" has internal project "Internal" Given group "TestGroup" has public project "Community" @@ -40,6 +45,7 @@ Feature: Explore Groups And I should not see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group merge requests for public project as visitor Given group "TestGroup" has internal project "Internal" Given group "TestGroup" has public project "Community" @@ -48,6 +54,7 @@ Feature: Explore Groups And I should not see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group with private, internal and public projects as user Given group "TestGroup" has internal project "Internal" Given group "TestGroup" has public project "Community" @@ -57,6 +64,7 @@ Feature: Explore Groups And I should see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group issues for internal and public projects as user Given group "TestGroup" has internal project "Internal" Given group "TestGroup" has public project "Community" @@ -66,6 +74,7 @@ Feature: Explore Groups And I should see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group merge requests for internal and public projects as user Given group "TestGroup" has internal project "Internal" Given group "TestGroup" has public project "Community" @@ -75,17 +84,20 @@ Feature: Explore Groups And I should see project "Internal" items And I should not see project "Enterprise" items + @javascript Scenario: I should see group with public project in public groups area Given group "TestGroup" has public project "Community" When I visit the public groups area Then I should see group "TestGroup" + @javascript Scenario: I should see group with public project in public groups area as user Given group "TestGroup" has public project "Community" When I sign in as a user And I visit the public groups area Then I should see group "TestGroup" + @javascript Scenario: I should see group with internal project in public groups area as user Given group "TestGroup" has internal project "Internal" When I sign in as a user diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index f914fd6f20a..827c4cd3d19 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -418,7 +418,6 @@ describe GroupsController do end end end - end describe 'GET #issues' do diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb index 984832b6959..74eba7e33f6 100644 --- a/spec/models/project_spec.rb +++ b/spec/models/project_spec.rb @@ -2199,7 +2199,6 @@ describe Project do it { expect(project.parent_id).to eq(project.namespace_id) } end - describe '#parent_changed?' do let(:project) { create(:project) } diff --git a/spec/serializers/group_child_serializer_spec.rb b/spec/serializers/group_child_serializer_spec.rb index 30333386058..566b235769e 100644 --- a/spec/serializers/group_child_serializer_spec.rb +++ b/spec/serializers/group_child_serializer_spec.rb @@ -39,7 +39,6 @@ describe GroupChildSerializer do subgroup1 = create(:group, parent: parent) subsub_group1 = create(:group, parent: subgroup1) subgroup2 = create(:group, parent: parent) - subsub_group2 = create(:group, parent: subgroup2) json = serializer.represent([subgroup1, subsub_group1, subgroup1, subgroup2]) subgroup1_json = json.first |