diff --git a/test/ex_doc/formatter/epub_test.exs b/test/ex_doc/formatter/epub_test.exs index ba4628946..e904a8749 100644 --- a/test/ex_doc/formatter/epub_test.exs +++ b/test/ex_doc/formatter/epub_test.exs @@ -132,9 +132,9 @@ defmodule ExDoc.Formatter.EPUBTest do content = File.read!("#{output_dir()}/OEBPS/readme.xhtml") assert content =~ ~r{README [^<]*} - assert content =~ ~r{RandomError} - assert content =~ ~r{CustomBehaviourImpl.hello/1} - assert content =~ ~r{TypesAndSpecs.Sub} + assert content =~ ~r{RandomError} + assert content =~ ~r{CustomBehaviourImpl.hello/1} + assert content =~ ~r{TypesAndSpecs.Sub} content = File.read!("#{output_dir()}/OEBPS/nav.xhtml") assert content =~ ~r{
  • README
  • } diff --git a/test/ex_doc/formatter/html/templates_test.exs b/test/ex_doc/formatter/html/templates_test.exs index a7a7a1edf..8d8790ad5 100644 --- a/test/ex_doc/formatter/html/templates_test.exs +++ b/test/ex_doc/formatter/html/templates_test.exs @@ -167,14 +167,14 @@ defmodule ExDoc.Formatter.HTML.TemplatesTest do test "site title text links to homepage_url when set" do content = Templates.sidebar_template(doc_config(), @empty_nodes_map) - assert content =~ ~r{\n\s*\n\s*} + assert content =~ ~r{\s*\s*} end test "site title text links to main when there is no homepage_url" do config = %ExDoc.Config{project: "Elixir", version: "1.0.1", source_root: File.cwd!, main: "hello",} content = Templates.sidebar_template(config, @empty_nodes_map) - assert content =~ ~r{\n\s*\n\s*} + assert content =~ ~r{\s*\s*} end test "list_page enables nav link when module type have at least one element" do @@ -206,7 +206,7 @@ defmodule ExDoc.Formatter.HTML.TemplatesTest do # Title and headers assert content =~ ~r{CompiledWithDocs [^<]*} - assert content =~ ~r{

    \n\s*Elixir v1.0.1\n\s*CompiledWithDocs\s*} + assert content =~ ~r{

    \s*Elixir v1.0.1\s*CompiledWithDocs\s*} refute content =~ ~r{module} assert content =~ ~r{moduledoc.*Example.*CompiledWithDocs\.example.*}ms assert content =~ ~r{

    .*.*.*.*Example.*

    }ms @@ -217,13 +217,13 @@ defmodule ExDoc.Formatter.HTML.TemplatesTest do assert content =~ ~r{example_1/0.*\(macro\)}ms # Source - assert content =~ ~r{]*>\n\s*\n\s*View Source\n\s*}ms + assert content =~ ~r{]*>\s*\s*View Source\s*}ms # Functions assert content =~ ~s{
    } assert content =~ ~s{} assert content =~ ~s{example(foo, bar \\\\ Baz)} - assert content =~ ~r{\n\s*\n\s*Link to this function\n\s*}ms + assert content =~ ~r{\s*\s*Link to this function\s*}ms end test "module_page outputs the types and function specs" do @@ -261,14 +261,14 @@ defmodule ExDoc.Formatter.HTML.TemplatesTest do test "module_page outputs behavior and callbacks" do content = get_module_page([CustomBehaviourOne]) - assert content =~ ~r{

    \n\s*Elixir v1.0.1\n\s*CustomBehaviourOne\s*behaviour}m + assert content =~ ~r{

    \s*Elixir v1.0.1\s*CustomBehaviourOne\s*behaviour}m assert content =~ ~r{Callbacks} assert content =~ ~r{
    } assert content =~ ~s[hello(integer)] assert content =~ ~s[greet(arg0)] content = get_module_page([CustomBehaviourTwo]) - assert content =~ ~r{

    \n\s*Elixir v1.0.1\n\s*CustomBehaviourTwo\s*behaviour\s*}m + assert content =~ ~r{

    \s*Elixir v1.0.1\s*CustomBehaviourTwo\s*behaviour\s*}m assert content =~ ~r{Callbacks} assert content =~ ~r{
    } end @@ -277,13 +277,13 @@ defmodule ExDoc.Formatter.HTML.TemplatesTest do test "module_page outputs the protocol type" do content = get_module_page([CustomProtocol]) - assert content =~ ~r{

    \n\s*Elixir v1.0.1\n\s*CustomProtocol\s*protocol\s*}m + assert content =~ ~r{

    \s*Elixir v1.0.1\s*CustomProtocol\s*protocol\s*}m end ## TASKS test "module_page outputs the task type" do content = get_module_page([Mix.Tasks.TaskWithDocs]) - assert content =~ ~r{

    \n\s*Elixir v1.0.1\n\s*mix task_with_docs\s*}m + assert content =~ ~r{

    \s*Elixir v1.0.1\s*mix task_with_docs\s*}m end end diff --git a/test/ex_doc/formatter/html_test.exs b/test/ex_doc/formatter/html_test.exs index 08c0b23b3..7b2d693f5 100644 --- a/test/ex_doc/formatter/html_test.exs +++ b/test/ex_doc/formatter/html_test.exs @@ -192,11 +192,11 @@ defmodule ExDoc.Formatter.HTMLTest do content = File.read!("#{output_dir()}/readme.html") assert content =~ ~r{README [^<]*} - assert content =~ ~r{

    .*.*Header sample.*

    }ms + assert content =~ ~r{

    .*.*Header sample.*

    }ms assert content =~ ~r{

    .*.*more > than.*

    }ms - assert content =~ ~r{RandomError} - assert content =~ ~r{CustomBehaviourImpl.hello/1} - assert content =~ ~r{TypesAndSpecs.Sub} + assert content =~ ~r{RandomError} + assert content =~ ~r{CustomBehaviourImpl.hello/1} + assert content =~ ~r{TypesAndSpecs.Sub} end test "run generates pages with custom names" do