Merge pull request #177 from mezuro/reading_form

Fixed color picker javascript

Merge pull request #177 from mezuro/reading_form
Fixed color picker javascript
Rafael Manzo
2 parents 444ceb65 0ab6555b
Showing 5 changed files with 24 additions and 27 deletions Show diff stats
app/views/readings/_form.html.erb
db/schema.rb
features/reading/edit.feature
features/step_definitions/repository_steps.rb
features/step_definitions/user_steps.rb
@@ -66,11 +66,7 @@
 <script>
   options = {
     trigger_event: "click",
-    color: {
-      r: 0,
-      g: 0,
-      b: 0
-    },
+    color: $("#reading_color").val(),
     onChange: function(colorHSB) {
       // Get first children "eq(0)" of #color_div with type "input"
       $("#color_div").children("input").eq(0).val(colorHSB.toHex());
@@ -13,48 +13,48 @@
 ActiveRecord::Schema.define(version: 20141211114023) do
-  create_table "kalibro_configuration_ownerships", force: true do |t|
+  create_table "kalibro_configuration_ownerships", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "kalibro_configuration_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  create_table "project_images", force: true do |t|
+  create_table "project_images", force: :cascade do |t|
     t.integer  "project_id"
-    t.string   "url"
+    t.string   "url",        limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  create_table "project_ownerships", force: true do |t|
+  create_table "project_ownerships", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "project_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  create_table "reading_group_ownerships", force: true do |t|
+  create_table "reading_group_ownerships", force: :cascade do |t|
     t.integer  "user_id"
     t.integer  "reading_group_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
-  create_table "users", force: true do |t|
-    t.string   "name",                   default: "", null: false
-    t.string   "email",                  default: "", null: false
+  create_table "users", force: :cascade do |t|
+    t.string   "name",                   limit: 255, default: "", null: false
+    t.string   "email",                  limit: 255, default: "", null: false
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+    t.string   "encrypted_password",     limit: 255, default: "", null: false
+    t.string   "reset_password_token",   limit: 255
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0
+    t.integer  "sign_in_count",                      default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
+    t.string   "current_sign_in_ip",     limit: 255
+    t.string   "last_sign_in_ip",        limit: 255
   end
   add_index "users", ["email"], name: "index_users_on_email", unique: true
@@ -9,10 +9,10 @@ Feature: Reading Edit
     And I am signed in
     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 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 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"
     When I fill the Label field with "Bad"
     And I press the Save button
     Then I should see "Bad"
@@ -33,13 +33,14 @@ Feature: Reading Edit
     And I should see "Color can't be blank"
   @kalibro_configuration_restart
-  Scenario: editing a reading with already taken name
+  Scenario: editing a reading with a name already taken
     Given I am a regular user
     And I am signed in
     And I own a sample reading group
     And I have a sample reading within the sample reading group labeled "Average"
     And I have a sample reading within the sample reading group labeled "Good"
     And I am at the Edit Reading page
+    Then the field "Label" should be filled with "Good"
     When I fill the Label field with "Average"
     And I press the Save button
     Then I should see "Label Should be unique within a Reading Group"
@@ -117,10 +117,6 @@ Then(/^I should see the sample repository name$/) do
   expect(page).to have_content(@repository.name)
 end
-Then(/^the field "(.*?)" should be filled with "(.*?)"$/) do |field, value|
-  expect(page.find_field(field).value).to eq(value)
-end
-
 Then(/^I should see the given module result$/) do
   expect(page).to have_content(@module_result.kalibro_module.name)
 end
@@ -10,6 +10,10 @@ When(/^I fill the (.+) field with &quot;(.+)&quot;$/) do |field, text|
   fill_in field, :with => text
 end
+Then(/^the field "(.*?)" should be filled with "(.*?)"$/) do |field, value|
+  expect(page.find_field(field).value).to eq(value)
+end
+
 Then(/^my name should have changed to (.+)$/) do |text|
   @user.reload
   expect(@user.name).to eq(text)