diff options
Diffstat (limited to 'test/controllers')
| -rw-r--r-- | test/controllers/nodes_controller_test.rb | 2 | ||||
| -rw-r--r-- | test/controllers/revisions_controller_test.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/controllers/nodes_controller_test.rb b/test/controllers/nodes_controller_test.rb index d7771081..de536278 100644 --- a/test/controllers/nodes_controller_test.rb +++ b/test/controllers/nodes_controller_test.rb | |||
| @@ -261,7 +261,7 @@ class NodesControllerTest < ActionController::TestCase | |||
| 261 | node = create_node_with_published_page | 261 | node = create_node_with_published_page |
| 262 | get :show, params: { :id => node.id } | 262 | get :show, params: { :id => node.id } |
| 263 | assert_response :success | 263 | assert_response :success |
| 264 | assert_select "div.node_content", :text => "Test", :count => 2 | 264 | assert_select "div.layout_row_content", :text => "Test", :count => 2 |
| 265 | end | 265 | end |
| 266 | 266 | ||
| 267 | test "unlocking a locked node" do | 267 | test "unlocking a locked node" do |
diff --git a/test/controllers/revisions_controller_test.rb b/test/controllers/revisions_controller_test.rb index 96c6d6cf..bb21ea68 100644 --- a/test/controllers/revisions_controller_test.rb +++ b/test/controllers/revisions_controller_test.rb | |||
| @@ -33,8 +33,8 @@ class RevisionsControllerTest < ActionController::TestCase | |||
| 33 | login_as :quentin | 33 | login_as :quentin |
| 34 | get :show, params: { :node_id => @node.id, :id => @node.pages.last.id } | 34 | get :show, params: { :node_id => @node.id, :id => @node.pages.last.id } |
| 35 | assert_response :success | 35 | assert_response :success |
| 36 | assert_select ".node_description", "Body" | 36 | assert_select ".layout_row_label", "Body" |
| 37 | assert_select ".node_content", {:count => 1, :text => "second"} | 37 | assert_select ".layout_row_content", {:count => 1, :text => "second"} |
| 38 | end | 38 | end |
| 39 | 39 | ||
| 40 | test "showing a revision renders real markup in the body, not escaped entities" do | 40 | test "showing a revision renders real markup in the body, not escaped entities" do |
| @@ -46,7 +46,7 @@ class RevisionsControllerTest < ActionController::TestCase | |||
| 46 | 46 | ||
| 47 | get :show, params: { :node_id => node.id, :id => node.head.id } | 47 | get :show, params: { :node_id => node.id, :id => node.head.id } |
| 48 | assert_response :success | 48 | assert_response :success |
| 49 | assert_select ".node_content h3", "Hello" | 49 | assert_select ".layout_row_content h3", "Hello" |
| 50 | end | 50 | end |
| 51 | 51 | ||
| 52 | test "diffing two revisions" do | 52 | test "diffing two revisions" do |
