Use bootstrap badges to implement count-number badges

[rails.git] / test / integration / user_changeset_comments_test.rb

diff --git a/test/integration/user_changeset_comments_test.rb b/test/integration/user_changeset_comments_test.rb
index 6030304697ff193a3fd4b276c4aabcde92256dc7..2b95094fec464587c4759737c633b9d7dd44fcd8 100644 (file)
--- a/test/integration/user_changeset_comments_test.rb
+++ b/test/integration/user_changeset_comments_test.rb
@@ -11,8 +11,10 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
     assert_select "div#content" do
       assert_select "div#sidebar" do
         assert_select "div#sidebar_content" do
     assert_select "div#content" do
       assert_select "div#sidebar" do
         assert_select "div#sidebar_content" do

-          assert_select "div.browse-section" do
-            assert_select "div.notice.hide_if_logged_in"
+          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
       end


@@ -28,7 +30,7 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
     follow_redirect!
     # We should now be at the login page
     assert_response :success
     follow_redirect!
     # We should now be at the login page
     assert_response :success

-    assert_template "user/login"
+    assert_template "sessions/new"

     # We can now login
     post "/login", :params => { "username" => user.email, "password" => "test" }
     assert_response :redirect
     # We can now login
     post "/login", :params => { "username" => user.email, "password" => "test" }
     assert_response :redirect


@@ -41,7 +43,7 @@ class UserChangesetCommentsTest < ActionDispatch::IntegrationTest
     assert_select "div#content" do
       assert_select "div#sidebar" do
         assert_select "div#sidebar_content" do
     assert_select "div#content" do
       assert_select "div#sidebar" do
         assert_select "div#sidebar_content" do

-          assert_select "div.browse-section" do
+          assert_select "div" do

             assert_select "form[action='#']" do
               assert_select "textarea[name=text]"
             end
             assert_select "form[action='#']" do
               assert_select "textarea[name=text]"
             end