fail decriptively when requested group was not found

scolalongo · Dec 12, 2017 · 12a1028 · 12a1028
1 parent 94ccf11
commit 12a1028
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/plugins/env/app/controllers/environment_variable_groups_controller.rb b/plugins/env/app/controllers/environment_variable_groups_controller.rb
@@ -42,11 +42,15 @@ def destroy
   end
 
   def preview
-    deploy_groups = DeployGroup.all
-    deploy_groups = @deploy_group.where(permalink: params[:deploy_group]) if params[:deploy_group].present?
-
-    if params[:group_id]
-      @group = EnvironmentVariableGroup.find(params[:group_id])
+    deploy_groups =
+      if deploy_group = params[:deploy_group].presence
+        [DeployGroup.find_by_permalink!(deploy_group)]
+      else
+        DeployGroup.all
+      end
+
+    if group_id = params[:group_id]
+      @group = EnvironmentVariableGroup.find(group_id)
       @project = Project.new(environment_variable_groups: [@group])
     else
       @project = Project.find(params[:project_id])

diff --git a/plugins/env/test/controllers/environment_variable_groups_controller_test.rb b/plugins/env/test/controllers/environment_variable_groups_controller_test.rb
@@ -124,6 +124,12 @@ def self.it_destroys
           [".pod2", {"X" => "Y", "Y" => "Z"}]
         ]
       end
+
+      it "fails when deploy group is unknown" do
+        assert_raises ActiveRecord::RecordNotFound do
+          get :preview, params: {group_id: env_group.id, project_id: project.id, deploy_group: "pod23" }, format: :json
+        end
+      end
     end
   end