diff --git a/app/controllers/metric_configurations_controller.rb b/app/controllers/metric_configurations_controller.rb index 31a84a8..fe928ba 100644 --- a/app/controllers/metric_configurations_controller.rb +++ b/app/controllers/metric_configurations_controller.rb @@ -31,7 +31,7 @@ class MetricConfigurationsController < ApplicationController def destroy @metric_configuration.destroy respond_to do |format| - format.html { redirect_to mezuro_configuration_path(@metric_configuration.configuration_id) } + format.html { redirect_to mezuro_configuration_path(params[:mezuro_configuration_id]) } format.json { head :no_content } end end diff --git a/features/metric_configuration/delete.feature b/features/metric_configuration/delete.feature new file mode 100644 index 0000000..1702df0 --- /dev/null +++ b/features/metric_configuration/delete.feature @@ -0,0 +1,25 @@ +Feature: Metric Configuration Deletion + In order to be able to remove metric configuration + As a regular user + The system should have an interface to it + + @kalibro_restart + Scenario: Should delete a metric configuration that I own + Given I am a regular user + And I am signed in + And I own a sample configuration + And I have a sample reading group + And I have a sample metric configuration within the given mezuro configuration + When I am at the Sample Configuration page + And I click the Destroy link + Then I should see "There are no metric configurations yet!" + + @kalibro_restart + Scenario: Should not see the destroy metric configuration link in the mezuro configuration that I not own + Given I am a regular user + And I am signed in + And I have a sample configuration + And I have a sample reading group + And I have a sample metric configuration within the given mezuro configuration + When I am at the Sample Configuration page + Then I should not see "Destroy" \ No newline at end of file diff --git a/features/reading/new.feature b/features/reading/new.feature index 9ff1e1c..192e55e 100644 --- a/features/reading/new.feature +++ b/features/reading/new.feature @@ -15,7 +15,7 @@ Feature: New reading And I should see "Grade" And I should see "Color" - @kalibro_restart + @kalibro_restart @wip Scenario: With valid fields Given I am a regular user And I am signed in diff --git a/features/step_definitions/metric_configuration_steps.rb b/features/step_definitions/metric_configuration_steps.rb index 4cae043..a27f011 100644 --- a/features/step_definitions/metric_configuration_steps.rb +++ b/features/step_definitions/metric_configuration_steps.rb @@ -1,7 +1,6 @@ Given(/^I have a sample metric configuration within the given mezuro configuration$/) do @metric_configuration = FactoryGirl.create(:metric_configuration, {id: nil, configuration_id: @mezuro_configuration.id, reading_group_id: @reading_group.id} ) - p @metric_configuration end Then(/^I should see the sample metric configuration content$/) do diff --git a/spec/controllers/metric_configurations_controller_spec.rb b/spec/controllers/metric_configurations_controller_spec.rb index f22b371..52bb072 100644 --- a/spec/controllers/metric_configurations_controller_spec.rb +++ b/spec/controllers/metric_configurations_controller_spec.rb @@ -113,7 +113,7 @@ describe MetricConfigurationsController do delete :destroy, id: metric_configuration.id, mezuro_configuration_id: mezuro_configuration.id.to_s end - it { should redirect_to(mezuro_configurations_path) } + it { should redirect_to(mezuro_configurations_path) } #FIXME : It should redirect to configuration show page it { should respond_with(:redirect) } end end -- libgit2 0.21.2