Merge remote-tracking branch 'upstream/pull/5161'

[rails.git] / test / system / index_test.rb

diff --git a/test/system/index_test.rb b/test/system/index_test.rb
index 1167797c5b8b85781a91e479fa21553c6cc22b6b..2944b817edced0d8f4e3590e84ff79ad8895bf2d 100644 (file)
--- a/test/system/index_test.rb
+++ b/test/system/index_test.rb
@@ -1,6 +1,41 @@
 require "application_system_test_case"
 
 class IndexTest < ApplicationSystemTestCase
 require "application_system_test_case"
 
 class IndexTest < ApplicationSystemTestCase

+  test "should remove and add an overlay on share button click" do
+    node = create(:node)
+    visit node_path(node)
+    assert_selector "#content.overlay-right-sidebar"
+    find(".icon.share").click
+    assert_no_selector "#content.overlay-right-sidebar"
+    find(".icon.share").click
+    assert_selector "#content.overlay-right-sidebar"
+  end
+
+  test "should add an overlay on close" do
+    node = create(:node)
+    visit node_path(node)
+    find(".icon.share").click
+    assert_no_selector "#content.overlay-right-sidebar"
+    find(".share-ui .btn-close").click
+    assert_selector "#content.overlay-right-sidebar"
+  end
+
+  test "should not add overlay when not closing right menu popup" do
+    node = create(:node)
+    visit node_path(node)
+    find(".icon.share").click
+
+    find(".icon.key").click
+    assert_no_selector "#content.overlay-right-sidebar"
+    find(".icon.layers").click
+    assert_no_selector "#content.overlay-right-sidebar"
+    find(".icon.key").click
+    assert_no_selector "#content.overlay-right-sidebar"
+
+    find(".icon.key").click
+    assert_selector "#content.overlay-right-sidebar"
+  end
+

   test "node included in edit link" do
     node = create(:node)
     visit node_path(node)
   test "node included in edit link" do
     node = create(:node)
     visit node_path(node)


@@ -12,7 +47,7 @@ class IndexTest < ApplicationSystemTestCase
 
   test "note included in edit link" do
     note = create(:note_with_comments)
 
   test "note included in edit link" do
     note = create(:note_with_comments)

-    visit browse_note_path(note)
+    visit note_path(note)

     assert_selector "#editanchor[href*='?note=#{note.id}#']"
 
     find("#sidebar .btn-close").click
     assert_selector "#editanchor[href*='?note=#{note.id}#']"
 
     find("#sidebar .btn-close").click


@@ -27,8 +62,8 @@ class IndexTest < ApplicationSystemTestCase
     visible_note = create(:note, :latitude => position, :longitude => position)
     create(:note_comment, :note => visible_note, :body => "this-is-a-visible-note")
 
     visible_note = create(:note, :latitude => position, :longitude => position)
     create(:note_comment, :note => visible_note, :body => "this-is-a-visible-note")
 

-    visit root_path(:anchor => "map=15/1/1") # view place of hidden note in case it is not rendered during browse_note_path(hidden_note)
-    visit browse_note_path(hidden_note)
+    visit root_path(:anchor => "map=15/1/1") # view place of hidden note in case it is not rendered during note_path(hidden_note)
+    visit note_path(hidden_note)

     find(".leaflet-control.control-layers .control-button").click
     find("#map-ui .overlay-layers .form-check-label", :text => "Map Notes").click
     visible_note_marker = find(".leaflet-marker-icon[title=this-is-a-visible-note]")
     find(".leaflet-control.control-layers .control-button").click
     find("#map-ui .overlay-layers .form-check-label", :text => "Map Notes").click
     visible_note_marker = find(".leaflet-marker-icon[title=this-is-a-visible-note]")