From f440bfd247fe6e69bc913ec60e3535fda4797031 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 2 Mar 2017 14:10:37 +0200 Subject: [PATCH] Improve groups list specs Signed-off-by: Dmitriy Zaporozhets --- app/views/dashboard/groups/_groups.html.haml | 3 +-- spec/features/dashboard/groups_list_spec.rb | 6 +++--- spec/features/explore/groups_list_spec.rb | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/views/dashboard/groups/_groups.html.haml b/app/views/dashboard/groups/_groups.html.haml index 7385e1725f0..6c3bf1a2b3b 100644 --- a/app/views/dashboard/groups/_groups.html.haml +++ b/app/views/dashboard/groups/_groups.html.haml @@ -1,7 +1,6 @@ .js-groups-list-holder %ul.content-list - @group_members.each do |group_member| - - group = group_member.group - = render 'shared/groups/group', group: group, group_member: group_member + = render 'shared/groups/group', group: group_member.group, group_member: group_member = paginate @group_members, theme: 'gitlab' diff --git a/spec/features/dashboard/groups_list_spec.rb b/spec/features/dashboard/groups_list_spec.rb index c1d5e4069c2..ca04107d33a 100644 --- a/spec/features/dashboard/groups_list_spec.rb +++ b/spec/features/dashboard/groups_list_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -RSpec.describe 'Dashboard Groups page', js: true, feature: true do +describe 'Dashboard Groups page', js: true, feature: true do include WaitForAjax let!(:user) { create :user } @@ -40,8 +40,8 @@ RSpec.describe 'Dashboard Groups page', js: true, feature: true do wait_for_ajax expect(page).to have_content(group.full_name) - expect(page).to have_content(public_group.full_name) - expect(page).not_to have_content(private_group.full_name) + expect(page).to have_content(nested_group.full_name) + expect(page).not_to have_content(another_group.full_name) expect(page.all('.js-groups-list-holder .content-list li').length).to eq 2 end end diff --git a/spec/features/explore/groups_list_spec.rb b/spec/features/explore/groups_list_spec.rb index 7b23115c527..773ae4b38bc 100644 --- a/spec/features/explore/groups_list_spec.rb +++ b/spec/features/explore/groups_list_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -RSpec.describe 'Explore Groups page', js: true, feature: true do +describe 'Explore Groups page', js: true, feature: true do include WaitForAjax let!(:user) { create :user }