Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.integration-tests
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,4 @@ CIRRUS_FML_PATH=./feature_manifest/sample.yml
CIRRUS_SENTRY_DSN=
CIRRUS_ENV_NAME=test_instance_stage
CIRRUS_GLEAN_MAX_EVENTS_BUFFER=1
DISABLE_CSRF=True
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ experimenter/experimenter/reporting/reporting-ui/assets/
.tmontmp
experimenter/coverage_html_report/
experimenter/tests/integration/test-reports/
experimenter/tests/integration/nimbus/fixtures/targeting_configs.json
experimenter/tests/integration/nimbus/fixtures/feature_configs.json
junit.xml
**/coverage_report/

Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ LOAD_COUNTRIES = python manage.py loaddata ./experimenter/base/fixtures/countrie
LOAD_LOCALES = python manage.py loaddata ./experimenter/base/fixtures/locales.json
LOAD_LANGUAGES = python manage.py loaddata ./experimenter/base/fixtures/languages.json
LOAD_FEATURES = python manage.py load_feature_configs
GENERATE_TARGETING_CONFIGS = python manage.py generate_targeting_configs
LOAD_DUMMY_EXPERIMENTS = [[ -z $$SKIP_DUMMY ]] && python manage.py load_dummy_experiments || python manage.py load_dummy_tags

JETSTREAM_CONFIG_URL = https://github.com/mozilla/metric-hub/archive/main.zip
Expand Down Expand Up @@ -226,7 +227,7 @@ bash: build_dev cirrus_build
refresh: kill build_dev cirrus_build compose_build refresh_db ## Rebuild all containers and the database

refresh_db: # Rebuild the database
$(COMPOSE_RUN) -e SKIP_DUMMY=$$SKIP_DUMMY experimenter bash -c '$(WAIT_FOR_DB) $(PYTHON_MIGRATE)&&$(LOAD_LOCALES)&&$(LOAD_COUNTRIES)&&$(LOAD_LANGUAGES)&&$(LOAD_FEATURES)&&$(LOAD_DUMMY_EXPERIMENTS)'
$(COMPOSE_RUN) -e SKIP_DUMMY=$$SKIP_DUMMY experimenter bash -c '$(WAIT_FOR_DB) $(PYTHON_MIGRATE)&&$(LOAD_LOCALES)&&$(LOAD_COUNTRIES)&&$(LOAD_LANGUAGES)&&$(LOAD_FEATURES)&&$(GENERATE_TARGETING_CONFIGS)&&$(LOAD_DUMMY_EXPERIMENTS)'

dependabot_approve:
echo "Install and configure the Github CLI https://github.com/cli/cli"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import json
import logging
from pathlib import Path

from django.core.management.base import BaseCommand

from experimenter.experiments.models import NimbusFeatureConfig
from experimenter.targeting.constants import NimbusTargetingConfig

logger = logging.getLogger()

FIXTURES_DIR = (
Path(__file__).resolve().parents[4] / "tests" / "integration" / "nimbus" / "fixtures"
)


class Command(BaseCommand):
help = "Generate targeting configs and feature configs JSON for integration tests"

def handle(self, *args, **options):
FIXTURES_DIR.mkdir(parents=True, exist_ok=True)

targeting_configs = [
{
"label": config.name,
"value": config.slug,
"applicationValues": list(config.application_choice_names),
"description": config.description,
"stickyRequired": config.sticky_required,
"isFirstRunRequired": config.is_first_run_required,
}
for config in NimbusTargetingConfig.targeting_configs
]
targeting_path = FIXTURES_DIR / "targeting_configs.json"
targeting_path.write_text(json.dumps(targeting_configs, indent=2) + "\n")
logger.info(
f"Generated {len(targeting_configs)} targeting configs to {targeting_path}"
)

feature_configs = [
{
"id": fc.id,
"slug": fc.slug,
"application": fc.application,
}
for fc in NimbusFeatureConfig.objects.filter(enabled=True).order_by(
"application", "slug"
)
]
feature_path = FIXTURES_DIR / "feature_configs.json"
feature_path.write_text(json.dumps(feature_configs, indent=2) + "\n")
logger.info(f"Generated {len(feature_configs)} feature configs to {feature_path}")
5 changes: 5 additions & 0 deletions experimenter/experimenter/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@
"experimenter.glean.middleware.GleanMiddleware",
]

if config("DISABLE_CSRF", default=False, cast=bool): # pragma: no cover
MIDDLEWARE = [
m for m in MIDDLEWARE if m != "django.middleware.csrf.CsrfViewMiddleware"
]

ROOT_URLCONF = "experimenter.urls"

TEMPLATES = [
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import json
from unittest.mock import patch

from django.core.management import call_command
from django.test import TestCase

from experimenter.experiments.tests.factories import NimbusFeatureConfigFactory
from experimenter.targeting.constants import NimbusTargetingConfig


class TestGenerateTargetingConfigsCommand(TestCase):
def test_generates_targeting_and_feature_configs(self):
NimbusFeatureConfigFactory.create(slug="test-feature", enabled=True)

with patch(
"experimenter.base.management.commands.generate_targeting_configs.FIXTURES_DIR"
) as mock_dir:
mock_dir.mkdir.return_value = None
targeting_path = mock_dir.__truediv__.return_value
targeting_path.write_text.return_value = None

call_command("generate_targeting_configs")

mock_dir.mkdir.assert_called_once_with(parents=True, exist_ok=True)
self.assertEqual(targeting_path.write_text.call_count, 2)

targeting_json = targeting_path.write_text.call_args_list[0][0][0]
targeting_configs = json.loads(targeting_json)
self.assertEqual(
len(targeting_configs), len(NimbusTargetingConfig.targeting_configs)
)
for config in targeting_configs:
self.assertIn("label", config)
self.assertIn("value", config)
self.assertIn("applicationValues", config)
self.assertIn("stickyRequired", config)
self.assertIn("isFirstRunRequired", config)

feature_json = targeting_path.write_text.call_args_list[1][0][0]
feature_configs = json.loads(feature_json)
self.assertTrue(len(feature_configs) > 0)
for fc in feature_configs:
self.assertIn("id", fc)
self.assertIn("slug", fc)
self.assertIn("application", fc)
Loading
Loading