From 558db2c37bc5e34231e5b00f91f1f193fde70c8c Mon Sep 17 00:00:00 2001 From: Anthony Davis Date: Sun, 8 Feb 2015 20:25:55 -0600 Subject: [PATCH] VRFS-850 - adding test for VRFS-2266 --- web/spec/features/feed_spec.rb | 2 -- web/spec/features/in_session_spec.rb | 16 +++++++++++++++- web/spec/support/utilities.rb | 6 ++++++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/web/spec/features/feed_spec.rb b/web/spec/features/feed_spec.rb index 02035dbbf..62004cbda 100644 --- a/web/spec/features/feed_spec.rb +++ b/web/spec/features/feed_spec.rb @@ -218,7 +218,6 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do formal_leave_by(finder_2) formal_leave_by(creator) - #leave_music_session_sleep_delay #erg in_client(creator) { verify_feed_shows_users creator, finder_1, finder_2 } end @@ -227,7 +226,6 @@ describe "Feed", :js => true, :type => :feature, :capybara_feature => true do formal_leave_by(finder_1) join_session(finder_2, description: description) - #leave_music_session_sleep_delay #erg in_client(finder_1) { verify_feed_shows_users finder_2, creator } end end diff --git a/web/spec/features/in_session_spec.rb b/web/spec/features/in_session_spec.rb index a657162c1..b2b1cb77e 100644 --- a/web/spec/features/in_session_spec.rb +++ b/web/spec/features/in_session_spec.rb @@ -84,7 +84,7 @@ describe "In a Session", :js => true, :type => :feature, :capybara_feature => tr end it "can rejoin private session as creator" do - pending + #pending creator, description = create_join_session(user, [finder]) in_client(user) do @@ -95,4 +95,18 @@ describe "In a Session", :js => true, :type => :feature, :capybara_feature => tr join_session(user, description: description) end + + specify "creator should receive join requests after changing session to 'by approval' (VRFS-2266)" do + creator, description = create_session + in_client(creator) do + set_session_access :by_approval + end + + request_to_join_session(finder, description: description) + + in_client(creator) do + expand_sidebar :notifications + expect(page).to have_content "#{finder.name} has requested to join your session." + end + end end diff --git a/web/spec/support/utilities.rb b/web/spec/support/utilities.rb index fa4638405..f54c23538 100644 --- a/web/spec/support/utilities.rb +++ b/web/spec/support/utilities.rb @@ -669,6 +669,12 @@ def sidebar_search_for string, category wait_for_ajax end +def expand_sidebar header_name + #search, friends, chat, notifications + panel_id = "panel#{header_name.to_s.capitalize}" + within("div[layout-id='#{panel_id}']") { find('div.panel-header').trigger(:click) } +end + def show_user_menu page.execute_script("$('ul.shortcuts').show()") #page.execute_script("JK.UserDropdown.menuHoverIn()")