Test notices of disabled changeset commenting

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index 1b3d245fbee55e0b8108ee4110ea225f9ecdde1e..583ac107fbb34fa35b01ee656b61a92d935b4f9e 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -65,7 +65,7 @@
   <% end %>
 
   <% unless current_user %>
   <% end %>
 
   <% unless current_user %>

-    <p class="notice">
+    <p>

       <%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %>
     </p>
   <% end %>
       <%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %>
     </p>
   <% end %>


@@ -83,7 +83,7 @@
         </div>
       </form>
     <% else %>
         </div>
       </form>
     <% else %>

-      <p class="notice">
+      <p>

         <%= t(".still_open") %>
       </p>
     <% end %>
         <%= t(".still_open") %>
       </p>
     <% end %>

diff --git a/test/integration/user_changeset_comments_test.rb b/test/integration/user_changeset_comments_test.rb
index 2b95094fec464587c4759737c633b9d7dd44fcd8..a1f08ae6d6881f523bf578dbb3c7762103e65660 100644 (file)
--- a/test/integration/user_changeset_comments_test.rb
+++ b/test/integration/user_changeset_comments_test.rb
@@ -1,26 +1,6 @@
 require "test_helper"
 
 class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
 require "test_helper"
 
 class UserChangesetCommentsTest < ActionDispatch::IntegrationTest

-  # Test 'log in to comment' message for nonlogged in user
-  def test_log_in_message
-    changeset = create(:changeset, :closed)
-
-    get "/changeset/#{changeset.id}"
-    assert_response :success
-
-    assert_select "div#content" do
-      assert_select "div#sidebar" do
-        assert_select "div#sidebar_content" do
-          assert_select "div" do
-            assert_select "p.notice" do
-              assert_select "a[href='/login?referer=%2Fchangeset%2F#{changeset.id}']", :text => I18n.t("browse.changeset.join_discussion"), :count => 1
-            end
-          end
-        end
-      end
-    end
-  end
-

   # Test if the form is shown
   def test_displaying_form
     user = create(:user)
   # Test if the form is shown
   def test_displaying_form
     user = create(:user)

diff --git a/test/system/changeset_comments_test.rb b/test/system/changeset_comments_test.rb
new file mode 100644 (file)
index 0000000..beed323
--- /dev/null
+++ b/test/system/changeset_comments_test.rb
@@ -0,0 +1,25 @@
+require "application_system_test_case"
+
+class ChangesetCommentsTest < ApplicationSystemTestCase
+  test "open changeset has a still open notice" do
+    changeset = create(:changeset)
+    sign_in_as(create(:user))
+    visit changeset_path(changeset)
+
+    within_sidebar do
+      assert_no_button "Comment"
+      assert_text "Changeset still open"
+    end
+  end
+
+  test "changeset has a login notice" do
+    changeset = create(:changeset, :closed)
+    visit changeset_path(changeset)
+
+    within_sidebar do
+      assert_no_button "Subscribe"
+      assert_no_button "Comment"
+      assert_link "Log in to join the discussion", :href => login_path(:referer => changeset_path(changeset))
+    end
+  end
+end