Test changeset commenting

diff --git a/test/integration/user_changeset_comments_test.rb b/test/integration/user_changeset_comments_test.rb
deleted file mode 100644 (file)
index a1f08ae..0000000
--- a/test/integration/user_changeset_comments_test.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "test_helper"
-
-class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
-  # Test if the form is shown
-  def test_displaying_form
-    user = create(:user)
-    changeset = create(:changeset, :closed)
-
-    get "/login"
-    follow_redirect!
-    # We should now be at the login page
-    assert_response :success
-    assert_template "sessions/new"
-    # We can now login
-    post "/login", :params => { "username" => user.email, "password" => "test" }
-    assert_response :redirect
-
-    get "/changeset/#{changeset.id}"
-
-    assert_response :success
-    assert_template "browse/changeset"
-
-    assert_select "div#content" do
-      assert_select "div#sidebar" do
-        assert_select "div#sidebar_content" do
-          assert_select "div" do
-            assert_select "form[action='#']" do
-              assert_select "textarea[name=text]"
-            end
-          end
-        end
-      end
-    end
-  end
-end

diff --git a/test/system/changeset_comments_test.rb b/test/system/changeset_comments_test.rb
index beed3238ce4717473433c8944ad611632a8b0530..51695c516e5aed274bb334a9bc9c88ad554e48d1 100644 (file)
--- a/test/system/changeset_comments_test.rb
+++ b/test/system/changeset_comments_test.rb
@@ -22,4 +22,26 @@ class ChangesetCommentsTest < ApplicationSystemTestCase
       assert_link "Log in to join the discussion", :href => login_path(:referer => changeset_path(changeset))
     end
   end
+
+  test "can add a comment to a changeset" do
+    changeset = create(:changeset, :closed)
+    user = create(:user)
+    sign_in_as(user)
+    visit changeset_path(changeset)
+
+    within_sidebar do
+      assert_no_content "Comment from #{user.display_name}"
+      assert_no_content "Some newly added changeset comment"
+      assert_button "Comment", :disabled => true
+
+      fill_in "text", :with => "Some newly added changeset comment"
+
+      assert_button "Comment", :disabled => false
+
+      click_on "Comment"
+
+      assert_content "Comment from #{user.display_name}"
+      assert_content "Some newly added changeset comment"
+    end
+  end
 end