From 9174ef492444dc066ef8e51ba3cdb0af9b3d4018 Mon Sep 17 00:00:00 2001 From: Heitor Reis Date: Wed, 4 Feb 2015 15:59:20 -0200 Subject: [PATCH] WIP: Fixing compound metric configuration create acceptance test --- app/controllers/compound_metric_configurations_controller.rb | 5 +++-- app/views/compound_metric_configurations/_created_metric.html.erb | 4 ++-- app/views/compound_metric_configurations/_form.html.erb | 18 +----------------- app/views/compound_metric_configurations/_metric_options.html.erb | 16 ++++++++++++++++ app/views/compound_metric_configurations/new.html.erb | 2 +- features/compound_metric_configuration/create.feature | 3 ++- features/step_definitions/compound_metric_configuration_steps.rb | 2 +- 7 files changed, 26 insertions(+), 24 deletions(-) diff --git a/app/controllers/compound_metric_configurations_controller.rb b/app/controllers/compound_metric_configurations_controller.rb index e339211..e2c159f 100644 --- a/app/controllers/compound_metric_configurations_controller.rb +++ b/app/controllers/compound_metric_configurations_controller.rb @@ -3,7 +3,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle def create super - metric_configuration.metric_snapshot.compound = true + metric_configuration.metric.type = "CompoundMetricSnapshot" respond_to do |format| create_and_redir(format) end @@ -40,6 +40,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle end def update_metric_configuration (new_metric_configuration) + @kalibro_configuration_id = params[:kalibro_configuration_id] @compound_metric_configuration = new_metric_configuration end @@ -56,7 +57,7 @@ class CompoundMetricConfigurationsController < BaseMetricConfigurationsControlle set_metric_configurations format.html { render action: destiny_action } - format.json { render json: @compound_metric_configuration.errors, status: :unprocessable_entity } + format.json { render json: @compound_metric_configuration.kalibro_errors, status: :unprocessable_entity } end #Code extracted from create action diff --git a/app/views/compound_metric_configurations/_created_metric.html.erb b/app/views/compound_metric_configurations/_created_metric.html.erb index caea76e..8e6df04 100644 --- a/app/views/compound_metric_configurations/_created_metric.html.erb +++ b/app/views/compound_metric_configurations/_created_metric.html.erb @@ -1,4 +1,4 @@ <%= metric_configuration.metric.name %> - <%= metric_configuration.code %> - \ No newline at end of file + <%= metric_configuration.metric.code %> + diff --git a/app/views/compound_metric_configurations/_form.html.erb b/app/views/compound_metric_configurations/_form.html.erb index b699fed..a160b36 100644 --- a/app/views/compound_metric_configurations/_form.html.erb +++ b/app/views/compound_metric_configurations/_form.html.erb @@ -8,22 +8,6 @@
- <%= f.label :code, class: 'control-label' %> - <%= f.text_field :code, :required => true, class: 'text-field form-control' %> -
-
-

- A variable that holds the value of a metric calculation. It can be used in the script of another compound metric. -

-

- Example: - Code foo := 10 -

-
-
- -
-
<%= f.label :weight, class: 'control-label' %> <%= f.text_field :weight, :required => true, class: 'text-field form-control' %>
@@ -53,4 +37,4 @@

<%= f.submit 'Save', class: 'btn btn-primary' %> -<%= link_to 'Back', kalibro_configuration_path(@compound_metric_configuration.configuration_id), class: 'btn btn-default' %> +<%= link_to 'Back', kalibro_configuration_path(@kalibro_configuration_id), class: 'btn btn-default' %> diff --git a/app/views/compound_metric_configurations/_metric_options.html.erb b/app/views/compound_metric_configurations/_metric_options.html.erb index aaaf124..3536747 100644 --- a/app/views/compound_metric_configurations/_metric_options.html.erb +++ b/app/views/compound_metric_configurations/_metric_options.html.erb @@ -45,4 +45,20 @@

+ +
+
+ <%= f.label :code, class: 'control-label' %> + <%= f.text_field :code, :required => true, class: 'text-field form-control' %> +
+
+

+ A variable that holds the value of a metric calculation. It can be used in the script of another compound metric. +

+

+ Example: + Code foo := 10 +

+
+
<%= f.hidden_field(:compound, { value: "true"}) %> diff --git a/app/views/compound_metric_configurations/new.html.erb b/app/views/compound_metric_configurations/new.html.erb index b59ced6..36335c8 100644 --- a/app/views/compound_metric_configurations/new.html.erb +++ b/app/views/compound_metric_configurations/new.html.erb @@ -6,7 +6,7 @@
-<%= form_for(@compound_metric_configuration, :url => kalibro_configuration_compound_metric_configurations_path(@compound_metric_configuration.configuration_id)) do |f| %> +<%= form_for(@compound_metric_configuration, :url => kalibro_configuration_compound_metric_configurations_path(@kalibro_configuration_id)) do |f| %> <%= render partial: 'form', locals: {f: f} %> <% end %> diff --git a/features/compound_metric_configuration/create.feature b/features/compound_metric_configuration/create.feature index 24b6dbf..aed0a1d 100644 --- a/features/compound_metric_configuration/create.feature +++ b/features/compound_metric_configuration/create.feature @@ -24,9 +24,10 @@ Feature: Compound Metric Configuration Creation And I set the select field "Scope" as "Class" And I set the select field "Reading Group" as "Scholar" And I press the Save button + And I take a picture of the page When I click the show link of "My Compound Metric" Then I should see "My Compound Metric" And I should see "mcm" And I should see "8" And I should see "AVERAGE" - \ No newline at end of file + diff --git a/features/step_definitions/compound_metric_configuration_steps.rb b/features/step_definitions/compound_metric_configuration_steps.rb index a88db82..991c407 100644 --- a/features/step_definitions/compound_metric_configuration_steps.rb +++ b/features/step_definitions/compound_metric_configuration_steps.rb @@ -3,7 +3,7 @@ Given(/^I see the sample metric configuration name$/) do end Given(/^I see the sample metric configuration code$/) do - expect(page).to have_content(@metric_configuration.code) + expect(page).to have_content(@metric_configuration.metric.code) end Given(/^I have a sample compound metric configuration within the given mezuro configuration$/) do -- libgit2 0.21.2