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

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

diff --git a/test/system/create_note_test.rb b/test/system/create_note_test.rb
index ccb2ed32fae1fd4ca8c825d995e81968bacc436e..435233cbe1f80ea15b824912f92d8bd00a69ef3b 100644 (file)
--- a/test/system/create_note_test.rb
+++ b/test/system/create_note_test.rb
@@ -4,20 +4,24 @@ class CreateNoteTest < ApplicationSystemTestCase
   test "can create note" do
     visit new_note_path(:anchor => "map=18/0/0")
 
-    assert_button "Add Note", :disabled => true
+    within_sidebar do
+      assert_button "Add Note", :disabled => true
 
-    fill_in "text", :with => "Some newly added note description"
-    click_on "Add Note"
+      fill_in "text", :with => "Some newly added note description"
+      click_on "Add Note"
 
-    assert_content "Unresolved note ##{Note.last.id}"
-    assert_content "Some newly added note description"
+      assert_content "Unresolved note ##{Note.last.id}"
+      assert_content "Some newly added note description"
+    end
   end
 
   test "cannot create note when api is readonly" do
     with_settings(:status => "api_readonly") do
       visit new_note_path(:anchor => "map=18/0/0")
 
-      assert_no_button "Add Note", :disabled => true
+      within_sidebar do
+        assert_no_button "Add Note", :disabled => true
+      end
     end
   end
 end