summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-09-07 10:58:52 +0100
committerPhil Hughes <me@iamphill.com>2016-09-13 08:44:59 +0100
commitecf7640b28562468880dda97ba42e5fd18c0859f (patch)
treee62aac4772dc492b84d10fac620ed66f0a9e80bc
parent401b797671b9b67ef40c4afa75acdeca83b6a6de (diff)
downloadgitlab-ce-ecf7640b28562468880dda97ba42e5fd18c0859f.tar.gz
Fixed group_links expire date not updating in view
-rw-r--r--app/views/projects/group_links/update.js.haml2
-rw-r--r--spec/features/projects/members/group_links_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/group_links/update.js.haml b/app/views/projects/group_links/update.js.haml
index d3a37847f58..231d5a79723 100644
--- a/app/views/projects/group_links/update.js.haml
+++ b/app/views/projects/group_links/update.js.haml
@@ -1,3 +1,3 @@
:plain
var $listItem = $('#{escape_javascript(render('shared/members/group', group_link: @group_link, group: @group_link.group))}');
- $("##{dom_id(@group_link.group)} .list-item-name").replaceWith($listItem.find('.list-item-name'));
+ $("#group_member_#{@group_link.id} .list-item-name").replaceWith($listItem.find('.list-item-name'));
diff --git a/spec/features/projects/members/group_links_spec.rb b/spec/features/projects/members/group_links_spec.rb
index 14ab7541fad..cc2f695211c 100644
--- a/spec/features/projects/members/group_links_spec.rb
+++ b/spec/features/projects/members/group_links_spec.rb
@@ -30,7 +30,7 @@ feature 'Projects > Members > Anonymous user sees members', feature: true, js: t
fill_in "member_expires_at_#{group.id}", with: tomorrow.strftime("%F")
wait_for_ajax
- page.within(first('li.member')) do
+ page.within(find('li.group_member')) do
expect(page).to have_content('Expires in')
end
end