Fix tests.

test/runosaari_web/controllers/performance_controller_test.exs

@@ -4,18 +4,18 @@ defmodule RunosaariWeb.PerformanceControllerTest do
   alias Runosaari.Schedule
 
   @create_attrs %{
-    description: "some description",
-    notes: "some notes",
-    time: ~N[2010-04-17 14:00:00],
+    name: "some name",
+    desc: "some description",
     seqnum: 1
   }
+
   @update_attrs %{
-    description: "some updated description",
-    notes: "some updated notes",
-    time: ~N[2011-05-18 15:01:01],
+    name: "some updated name",
+    desc: "some updated description",
     seqnum: 2
   }
-  @invalid_attrs %{description: nil, notes: nil, time: nil, seqnum: nil}
+
+  @invalid_attrs %{name: nil, desc: nil, seqnum: nil}
 
   def fixture(:performance) do
     {:ok, performance} = Schedule.create_performance(@create_attrs)
@@ -58,7 +58,7 @@ defmodule RunosaariWeb.PerformanceControllerTest do
 
     test "renders form for editing chosen performance", %{conn: conn, performance: performance} do
       conn = get(conn, Routes.admin_performance_path(conn, :edit, performance))
-      assert html_response(conn, 200) =~ "Muokkaa näytöstä"
+      assert html_response(conn, 200) =~ "Muokkaa näytöksen tietoja"
     end
   end
 
@@ -83,7 +83,7 @@ defmodule RunosaariWeb.PerformanceControllerTest do
           performance: @invalid_attrs
         )
 
-      assert html_response(conn, 200) =~ "Muokkaa näytöstä"
+      assert html_response(conn, 200) =~ "Muokkaa näytöksen tietoja"
     end
   end
 

test/runosaari_web/controllers/performer_controller_test.exs

@@ -4,48 +4,21 @@ defmodule RunosaariWeb.PerformerControllerTest do
   alias Runosaari.Registration
 
   @create_attrs %{
-    confirmed: true,
-    email: "some email",
-    fname: "some fname",
-    lname: "some lname",
-    tel: "some tel",
-    desc: "some desc",
-    date1: true,
-    date2: true,
-    date3: true,
-    bus: true,
-    accom: true,
+    name: "some name",
+    desc: "some description",
+    confirmed: false,
     seqnum: 1
   }
+
   @update_attrs %{
-    confirmed: false,
-    email: "some updated email",
-    fname: "some updated fname",
-    lname: "some updated lname",
-    tel: "some updated tel",
-    desc: "some updated desc",
-    date1: true,
-    date2: true,
-    date3: true,
-    bus: true,
-    accom: true,
+    name: "some updated name",
+    desc: "some updated description",
+    confirmed: true,
     seqnum: 2
   }
 
-  @invalid_attrs %{
-    confirmed: nil,
-    email: nil,
-    fname: nil,
-    lname: nil,
-    tel: nil,
-    desc: nil,
-    date1: nil,
-    date2: nil,
-    date3: nil,
-    bus: nil,
-    accom: nil,
-    seqnum: nil
-  }
+  @invalid_attrs %{name: nil, desc: nil, confirmed: nil, seqnum: nil}
+
   def fixture(:performer) do
     {:ok, performer} = Registration.create_performer(@create_attrs)
     performer
@@ -69,11 +42,10 @@ defmodule RunosaariWeb.PerformerControllerTest do
     test "redirects to show when data is valid", %{conn: conn} do
       conn = post(conn, Routes.admin_performer_path(conn, :create), performer: @create_attrs)
 
-      assert %{id: id} = redirected_params(conn)
-      assert redirected_to(conn) == Routes.admin_performer_path(conn, :show, id)
+      assert redirected_to(conn) == Routes.admin_performer_path(conn, :admin)
 
-      conn = get(conn, Routes.admin_performer_path(conn, :show, id))
-      assert html_response(conn, 200) =~ "Esiintyjän tiedot"
+      conn = get(conn, Routes.admin_performer_path(conn, :admin))
+      assert html_response(conn, 200) =~ "HALLINTA - Esiintyjät"
     end
 
     test "renders errors when data is invalid", %{conn: conn} do
@@ -101,7 +73,7 @@ defmodule RunosaariWeb.PerformerControllerTest do
       assert redirected_to(conn) == Routes.admin_performer_path(conn, :show, performer)
 
       conn = get(conn, Routes.admin_performer_path(conn, :show, performer))
-      assert html_response(conn, 200) =~ "some updated email"
+      assert html_response(conn, 200) =~ "some updated name"
     end
 
     test "renders errors when data is invalid", %{conn: conn, performer: performer} do

test/runosaari_web/controllers/visitor_controller_test.exs

@@ -4,37 +4,37 @@ defmodule RunosaariWeb.VisitorControllerTest do
   alias Runosaari.Registration
 
   @create_attrs %{
-    accom: true,
-    shared: true,
+    fname: "some fname",
+    lname: "some lname",
+    email: "some email",
+    tel: "some tel",
     date1: true,
     date2: true,
     date3: true,
-    email: "some email",
-    fname: "some fname",
-    lname: "some lname",
-    tel: "some tel"
+    accom: true,
+    shared: true
   }
   @update_attrs %{
-    accom: false,
-    shared: false,
+    fname: "some updated fname",
+    lname: "some updated lname",
+    email: "some updated email",
+    tel: "some updated tel",
     date1: false,
     date2: false,
     date3: false,
-    email: "some updated email",
-    fname: "some updated fname",
-    lname: "some updated lname",
-    tel: "some updated tel"
+    accom: false,
+    shared: false
   }
   @invalid_attrs %{
-    accom: nil,
-    shared: nil,
+    fname: nil,
+    lname: nil,
+    email: nil,
+    tel: nil,
     date1: nil,
     date2: nil,
     date3: nil,
-    email: nil,
-    fname: nil,
-    lname: nil,
-    tel: nil
+    accom: nil,
+    shared: nil
   }
 
   def fixture(:visitor) do
@@ -45,14 +45,14 @@ defmodule RunosaariWeb.VisitorControllerTest do
   describe "index" do
     test "lists all visitors", %{conn: conn} do
       conn = get(conn, Routes.admin_visitor_path(conn, :index))
-      assert html_response(conn, 200) =~ "Listing Visitors"
+      assert html_response(conn, 200) =~ "HALLINTA - Osallistujat"
     end
   end
 
   describe "new visitor" do
     test "renders form", %{conn: conn} do
       conn = get(conn, Routes.visitor_path(conn, :new))
-      assert html_response(conn, 200) =~ "New Visitor"
+      assert html_response(conn, 200) =~ "Ilmoittaudu"
     end
   end
 
@@ -60,16 +60,15 @@ defmodule RunosaariWeb.VisitorControllerTest do
     test "redirects to show when data is valid", %{conn: conn} do
       conn = post(conn, Routes.visitor_path(conn, :create), visitor: @create_attrs)
 
-      assert %{id: id} = redirected_params(conn)
-      assert redirected_to(conn) == Routes.admin_visitor_path(conn, :show, id)
+      assert redirected_to(conn) == Routes.visitor_path(conn, :confirmation)
 
-      conn = get(conn, Routes.admin_visitor_path(conn, :show, id))
-      assert html_response(conn, 200) =~ "Show Visitor"
+      conn = get(conn, Routes.visitor_path(conn, :confirmation))
+      assert html_response(conn, 200) =~ "Ilmoittautumisesi on rekisteröity."
     end
 
     test "renders errors when data is invalid", %{conn: conn} do
       conn = post(conn, Routes.visitor_path(conn, :create), visitor: @invalid_attrs)
-      assert html_response(conn, 200) =~ "New Visitor"
+      assert html_response(conn, 200) =~ "Ilmoittaudu"
     end
   end
 
@@ -78,7 +77,7 @@ defmodule RunosaariWeb.VisitorControllerTest do
 
     test "renders form for editing chosen visitor", %{conn: conn, visitor: visitor} do
       conn = get(conn, Routes.admin_visitor_path(conn, :edit, visitor))
-      assert html_response(conn, 200) =~ "Edit Visitor"
+      assert html_response(conn, 200) =~ "Muokkaa osallistujan tietoja"
     end
   end
 
@@ -97,7 +96,7 @@ defmodule RunosaariWeb.VisitorControllerTest do
     test "renders errors when data is invalid", %{conn: conn, visitor: visitor} do
       conn = put(conn, Routes.admin_visitor_path(conn, :update, visitor), visitor: @invalid_attrs)
 
-      assert html_response(conn, 200) =~ "Edit Visitor"
+      assert html_response(conn, 200) =~ "Muokkaa osallistujan tietoja"
     end
   end