From 3fd1304bf294ec6adb2ba24a8f419d7738be35d9 Mon Sep 17 00:00:00 2001
From: Diego Araújo <diegoamc90@gmail.com>
Date: Tue, 3 Feb 2015 17:06:00 -0200
Subject: [PATCH] WIP: Working on Reading acceptance tests.

---
 app/controllers/readings_controller.rb           |  4 +++-
 app/models/reading.rb                            |  1 +
 app/views/readings/_form.html.erb                |  8 +++++++-
 app/views/readings/edit.html.erb                 |  2 +-
 features/reading/edit.feature                    | 10 +++++-----
 features/reading/new.feature                     | 12 ++++++------
 features/step_definitions/reading_group_steps.rb |  4 ----
 features/step_definitions/reading_steps.rb       |  4 ++--
 8 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/app/controllers/readings_controller.rb b/app/controllers/readings_controller.rb
index 6c89b09..0dbc8e9 100644
--- a/app/controllers/readings_controller.rb
+++ b/app/controllers/readings_controller.rb
@@ -9,6 +9,7 @@ class ReadingsController < ApplicationController
 
   def new
     @reading = Reading.new
+    @reading_group_id = params[:reading_group_id]
   end
 
   def create
@@ -55,7 +56,7 @@ class ReadingsController < ApplicationController
   # Duplicated code on create and update actions extracted here
   def failed_action(format, destiny_action)
     format.html { render action: destiny_action }
-    format.json { render json: @reading.errors, status: :unprocessable_entity }
+    format.json { render json: @reading.kalibro_errors, status: :unprocessable_entity }
   end
 
   # Code extracted from create action
@@ -63,6 +64,7 @@ class ReadingsController < ApplicationController
     if @reading.save
       format.html { redirect_to reading_group_path(@reading.reading_group_id), notice: 'Reading was successfully created.' }
     else
+      @reading_group_id = params[:reading_group_id]
       failed_action(format, 'new')
     end
   end
diff --git a/app/models/reading.rb b/app/models/reading.rb
index 622706d..4c03a43 100644
--- a/app/models/reading.rb
+++ b/app/models/reading.rb
@@ -1,2 +1,3 @@
 class Reading < KalibroClient::Entities::Configurations::Reading
+  include KalibroRecord
 end
diff --git a/app/views/readings/_form.html.erb b/app/views/readings/_form.html.erb
index 83d4ff8..22724f9 100644
--- a/app/views/readings/_form.html.erb
+++ b/app/views/readings/_form.html.erb
@@ -54,7 +54,13 @@
 
 <div class="row margin-left-none" style="margin-top: 20px">
   <%= f.submit 'Save', class: 'btn btn-primary' %>
-  <%= link_to 'Back', reading_group_path(@reading_group_id), class: 'btn btn-default' %>
+  <% if @reading.persisted? %>
+    <%= f.hidden_field(:reading_group_id, value: @reading.reading_group_id) %>
+    <%= link_to 'Back', reading_group_path(@reading.reading_group_id), class: 'btn btn-default' %>
+  <% else %>
+    <%= f.hidden_field(:reading_group_id, value: @reading_group_id) %>
+    <%= link_to 'Back', reading_group_path(@reading_group_id), class: 'btn btn-default' %>
+  <% end %>
 </div>
 
 <script>
diff --git a/app/views/readings/edit.html.erb b/app/views/readings/edit.html.erb
index ab14758..84e6bf1 100644
--- a/app/views/readings/edit.html.erb
+++ b/app/views/readings/edit.html.erb
@@ -2,6 +2,6 @@
   <h1>Editing Reading</h1>
 </div>
 
-<%= form_for(@reading, :url => reading_group_reading_update_url(@reading_group_id, @reading.id), method: :put) do |f| %>
+<%= form_for(@reading, :url => reading_group_reading_update_path(@reading.reading_group_id, @reading.id), method: :put) do |f| %>
   <%= render partial: 'form', locals: {f: f} %>
 <% end %>
diff --git a/features/reading/edit.feature b/features/reading/edit.feature
index dad02e6..45061c1 100644
--- a/features/reading/edit.feature
+++ b/features/reading/edit.feature
@@ -10,9 +10,9 @@ Feature: Reading Edit
     And I own a sample reading group
     And I have a sample reading within the sample reading group
     And I am at the Edit Reading page
-    Then the field "Label" should be filled with "Good"
-    And the field "Grade" should be filled with "10.5"
-    And the field "Color" should be filled with "33dd33"
+    Then I fill the Label field with "Good"
+    And I fill the Grade field with "10.5"
+    And I fill the Color field with "33DD33"
     When I fill the Label field with "Bad"
     And I press the Save button
     Then I should see "Bad"
@@ -25,7 +25,7 @@ Feature: Reading Edit
     And I have a sample reading within the sample reading group
     And I am at the Edit Reading page
     When I fill the Label field with " "
-    And I fill the Grade field with " "
+    And I fill the Grade field with "      "
     And I fill the Color field with " "
     And I press the Save button
     Then I should see "Label can't be blank"
@@ -42,7 +42,7 @@ Feature: Reading Edit
     And I am at the Edit Reading page
     When I fill the Label field with "Average"
     And I press the Save button
-    Then I should see "Label There is already a Reading with label Average! Please, choose another one."
+    Then I should see "Label Should be unique within a Reading Group"
 
   @kalibro_configuration_restart
   Scenario: editing a reading with non numerical value
diff --git a/features/reading/new.feature b/features/reading/new.feature
index 2a1cc48..bb46204 100644
--- a/features/reading/new.feature
+++ b/features/reading/new.feature
@@ -24,7 +24,7 @@ Feature: New reading
     And I am at the New Reading page
     And I fill the Label field with "My Reading"
     And I fill the Grade field with "1"
-    And I fill the Color field with "00000ff00"
+    And I fill the Color field with "00ff00"
     When I press the Save button
     Then I should be in the Sample Reading Group page
 
@@ -59,9 +59,9 @@ Feature: New reading
     And I am at the New Reading page
     And I fill the Label field with "My Reading"
     And I fill the Grade field with "1"
-    And I fill the Color field with "00000ff00"
+    And I fill the Color field with "00ff00"
     When I press the Save button
-    Then I should see "1 error prohibited this Reading from being saved"
+    Then I should see "Label Should be unique within a Reading Group"
     And I should be at the New Reading page
 
   @kalibro_configuration_restart
@@ -72,12 +72,12 @@ Feature: New reading
     And I am at the New Reading page
     And I fill the Label field with "My Reading"
     And I fill the Grade field with "z"
-    And I fill the Color field with "00000ff00"
+    And I fill the Color field with "000ff0"
     When I press the Save button
     Then I should see "Grade is not a number"
     And I should be at the New Reading page
 
-  @kalibro_configuration_restart
+  @kalibro_configuration_restart @javascript
   Scenario: With an invalid color
     Given I am a regular user
     And I am signed in
@@ -87,5 +87,5 @@ Feature: New reading
     And I fill the Grade field with "1"
     And I fill the Color field with "z"
     When I press the Save button
-    Then I should see "1 error prohibited this Reading from being saved"
+    Then I should see "Color must be hexadecimal"
     And I should be at the New Reading page
diff --git a/features/step_definitions/reading_group_steps.rb b/features/step_definitions/reading_group_steps.rb
index d3a60bf..9510a15 100644
--- a/features/step_definitions/reading_group_steps.rb
+++ b/features/step_definitions/reading_group_steps.rb
@@ -12,10 +12,6 @@ Given(/^I have a reading group named "(.*?)"$/) do |name|
   @reading_group = FactoryGirl.create(:reading_group, {name: name})
 end
 
-Given(/^I have a sample reading within the sample reading group$/) do
-  @reading = FactoryGirl.create(:reading, {reading_group_id: @reading_group.id})
-end
-
 Given(/^I own a sample reading group$/) do
   @reading_group = FactoryGirl.create(:reading_group)
   FactoryGirl.create(:reading_group_ownership, {user_id: @user.id, reading_group_id: @reading_group.id})
diff --git a/features/step_definitions/reading_steps.rb b/features/step_definitions/reading_steps.rb
index 2d9779b..cade97f 100644
--- a/features/step_definitions/reading_steps.rb
+++ b/features/step_definitions/reading_steps.rb
@@ -1,4 +1,4 @@
-Given(/^I have a sample reading within the module result$/) do
+Given(/^I have a sample reading within the sample reading group$/) do
   @reading = FactoryGirl.create(:reading, {reading_group_id: @reading_group.id})
 end
 
@@ -7,7 +7,7 @@ Given(/^I am at the New Reading page$/) do
 end
 
 Given(/^I am at the Edit Reading page$/) do
-  visit edit_reading_group_reading_url(@reading_group.id, @reading.id)
+  visit edit_reading_group_reading_path(@reading_group.id, @reading.id)
 end
 
 Given(/^I have a sample reading within the sample reading group labeled "(.*?)"$/) do |label|
--
libgit2 0.21.2