Fix configuration for combined experiments

lib/split/configuration.rb

@@ -116,7 +116,13 @@ def bots
 
     def experiments=(experiments)
       raise InvalidExperimentsFormatError.new("Experiments must be a Hash") unless experiments.respond_to?(:keys)
-      @experiments = experiments
+      @experiments = experiments.clone
+      experiments.each do |name, settings|
+        value_for(settings, :combined_experiments)&.each do |combined_name|
+          @experiments[combined_name] =
+            settings.reject { |k, v| [:combined_experiments, "combined_experiments"].include?(k) }
+        end
+      end
     end
 
     def disabled?

spec/configuration_spec.rb

@@ -136,13 +136,28 @@
               alternatives:
                 - a
                 - b
+            combined_experiment:
+              alternatives:
+                - a
+                - b
+              combined_experiments:
+                - combined1
+                - combined2
+              resettable: false
           eos
           @config.experiments = YAML.load(experiments_yaml)
         end
 
         it "should normalize experiments" do
-          expect(@config.normalized_experiments).to eq({ my_experiment: { resettable: false, alternatives: [{ "Control Opt"=>0.67 },
-            [{ "Alt One"=>0.1 }, { "Alt Two"=>0.23 }]] }, another_experiment: { alternatives: ["a", ["b"]] } })
+          result = {
+            my_experiment: { resettable: false, alternatives: [{ "Control Opt"=>0.67 }, [{ "Alt One"=>0.1 }, { "Alt Two"=>0.23 }]] },
+            another_experiment: { alternatives: ["a", ["b"]] },
+            combined_experiment: { resettable: false, alternatives: ["a", ["b"]] },
+            combined1: { resettable: false, alternatives: ["a", ["b"]] },
+            combined2: { resettable: false, alternatives: ["a", ["b"]] }
+          }
+
+          expect(@config.normalized_experiments).to eq(result)
         end
 
         it "should recognize metrics" do

spec/helper_spec.rb

@@ -476,6 +476,24 @@
       expect(ab_user[experiment.key]).to eq(alternative)
       expect(ab_user[experiment.finished_key]).to eq(true)
     end
+
+    context "combined experiment" do
+      it "passes reset option" do
+        Split.configuration.experiments = {
+          combined: {
+            alternatives: ["one", "two"],
+            combined_experiments: [:combined1],
+            resettable: false,
+          },
+        }
+        alternative = ab_test(:combined1)
+        experiment = Split::ExperimentCatalog.find :combined1
+
+        ab_finished :combined1
+        expect(ab_user[experiment.key]).to eq(alternative)
+        expect(ab_user[experiment.finished_key]).to eq(true)
+      end
+    end
   end
 
   context "finished with metric name" do