Merge pull request #1045 from StepicOrg/release/1.190

Release 1.190
StepicOrg · Sep 15, 2021 · bff7089 · bff7089
2 parents 7c971e6 + 7c25cd7
commit bff7089
Show file tree

Hide file tree

Showing 21 changed files with 57 additions and 49 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 ruby "2.6.5"
 
 gem "fastlane", "2.193.1"
-gem "cocoapods", "1.11.0"
+gem "cocoapods", "1.11.2"
 gem "generamba", "1.5.0"
 
 eval_gemfile("fastlane/Pluginfile")
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -33,10 +33,10 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     babosa (1.0.4)
     claide (1.0.3)
-    cocoapods (1.11.0)
+    cocoapods (1.11.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.11.0)
+      cocoapods-core (= 1.11.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.4.0, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -51,7 +51,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 1.0, < 3.0)
       xcodeproj (>= 1.21.0, < 2.0)
-    cocoapods-core (1.11.0)
+    cocoapods-core (1.11.2)
       activesupport (>= 5.0, < 7)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -281,7 +281,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.11.0)
+  cocoapods (= 1.11.2)
   fastlane (= 2.193.1)
   fastlane-plugin-firebase_app_distribution
   generamba (= 1.5.0)

diff --git a/Stepic.xcodeproj/project.pbxproj b/Stepic.xcodeproj/project.pbxproj
@@ -12539,7 +12539,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 369;
+				CURRENT_PROJECT_VERSION = 371;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				INFOPLIST_FILE = "StickerPackExtension/Info-Production.plist";
@@ -12564,7 +12564,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 369;
+				CURRENT_PROJECT_VERSION = 371;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				INFOPLIST_FILE = "StickerPackExtension/Info-Production.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -12706,7 +12706,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 369;
+				CURRENT_PROJECT_VERSION = 371;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = "Stepic/Info-Production.plist";
@@ -12736,7 +12736,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 369;
+				CURRENT_PROJECT_VERSION = 371;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				ENABLE_BITCODE = YES;
 				"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
@@ -12827,7 +12827,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 369;
+				CURRENT_PROJECT_VERSION = 371;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = "Stepic/Info-Develop.plist";
@@ -12879,7 +12879,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 369;
+				CURRENT_PROJECT_VERSION = 371;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				INFOPLIST_FILE = "StickerPackExtension/Info-Develop.plist";
@@ -12960,7 +12960,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 369;
+				CURRENT_PROJECT_VERSION = 371;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = "Stepic/Info-Develop.plist";
@@ -13008,7 +13008,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 369;
+				CURRENT_PROJECT_VERSION = 371;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				INFOPLIST_FILE = "StickerPackExtension/Info-Develop.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -13529,7 +13529,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 369;
+				CURRENT_PROJECT_VERSION = 371;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = "Stepic/Info-Release.plist";
@@ -13583,7 +13583,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 369;
+				CURRENT_PROJECT_VERSION = 371;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				INFOPLIST_FILE = "StickerPackExtension/Info-Release.plist";
@@ -13665,7 +13665,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 369;
+				CURRENT_PROJECT_VERSION = 371;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = "Stepic/Info-Release.plist";
@@ -13713,7 +13713,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 369;
+				CURRENT_PROJECT_VERSION = 371;
 				DEVELOPMENT_TEAM = UJ4KC2QN7B;
 				INFOPLIST_FILE = "StickerPackExtension/Info-Release.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 11.0;

diff --git a/Stepic/Info-Develop.plist b/Stepic/Info-Develop.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189-develop</string>
+	<string>1.190-develop</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -62,7 +62,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>

diff --git a/Stepic/Info-Production.plist b/Stepic/Info-Production.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189</string>
+	<string>1.190</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -62,7 +62,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>

diff --git a/Stepic/Info-Release.plist b/Stepic/Info-Release.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189-release</string>
+	<string>1.190-release</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -62,7 +62,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 	<key>FacebookAppID</key>
 	<string>171127739724012</string>
 	<key>FacebookDisplayName</key>

diff --git a/Stepic/Sources/Frameworks/ContentProcessor/Processing/ContentProcessingRule.swift b/Stepic/Sources/Frameworks/ContentProcessor/Processing/ContentProcessingRule.swift
@@ -164,3 +164,10 @@ final class ReplaceModelViewerWithARImageRule: BaseHTMLExtractionRule {
         return content
     }
 }
+
+/// Makes the contents of the <details> element visible and prevents toggle behavior.
+final class AlwaysOpenedDetailsDisclosureBoxRule: BaseHTMLExtractionRule {
+    override func process(content: String) -> String {
+        content.replacingOccurrences(of: "<details>", with: "<details open onclick=\"return false\">")
+    }
+}
diff --git a/Stepic/Sources/Frameworks/ContentProcessor/Processing/ContentProcessor.swift b/Stepic/Sources/Frameworks/ContentProcessor/Processing/ContentProcessor.swift
@@ -22,7 +22,8 @@ final class ContentProcessor: ContentProcessorProtocol {
     static let defaultRules: [ContentProcessingRule] = [
         FixRelativeProtocolURLsRule(),
         AddStepikSiteForRelativeURLsRule(extractorType: HTMLExtractor.self),
-        RemoveImageFixedHeightRule(extractorType: HTMLExtractor.self)
+        RemoveImageFixedHeightRule(extractorType: HTMLExtractor.self),
+        AlwaysOpenedDetailsDisclosureBoxRule(extractorType: HTMLExtractor.self)
     ]
 
     private let rules: [ContentProcessingRule]

diff --git a/StepicTests/Info-Develop.plist b/StepicTests/Info-Develop.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189-develop</string>
+	<string>1.190-develop</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 </dict>
 </plist>
diff --git a/StepicTests/Info-Production.plist b/StepicTests/Info-Production.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189</string>
+	<string>1.190</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 </dict>
 </plist>
diff --git a/StepicTests/Info-Release.plist b/StepicTests/Info-Release.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189-release</string>
+	<string>1.190-release</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 </dict>
 </plist>
diff --git a/StepicUITests/Info-Develop.plist b/StepicUITests/Info-Develop.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189-develop</string>
+	<string>1.190-develop</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 </dict>
 </plist>
diff --git a/StepicUITests/Info-Production.plist b/StepicUITests/Info-Production.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189</string>
+	<string>1.190</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 </dict>
 </plist>
diff --git a/StepicUITests/Info-Release.plist b/StepicUITests/Info-Release.plist
@@ -15,8 +15,8 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189-release</string>
+	<string>1.190-release</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 </dict>
 </plist>
diff --git a/StepicWidget/Info-Develop.plist b/StepicWidget/Info-Develop.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189-develop</string>
+	<string>1.190-develop</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/StepicWidget/Info-Production.plist b/StepicWidget/Info-Production.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189</string>
+	<string>1.190</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/StepicWidget/Info-Release.plist b/StepicWidget/Info-Release.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189-release</string>
+	<string>1.190-release</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/StickerPackExtension/Info-Develop.plist b/StickerPackExtension/Info-Develop.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189-develop</string>
+	<string>1.190-develop</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/StickerPackExtension/Info-Production.plist b/StickerPackExtension/Info-Production.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189</string>
+	<string>1.190</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/StickerPackExtension/Info-Release.plist b/StickerPackExtension/Info-Release.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.189-release</string>
+	<string>1.190-release</string>
 	<key>CFBundleVersion</key>
-	<string>369</string>
+	<string>371</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/fastlane/release-notes.txt b/fastlane/release-notes.txt
@@ -1,9 +1,9 @@
 Что тестировать:
+- Не отображается содержание details в шагах APPS-3424
 - При согласии на получение streak нотификаций не проверяется permission на получение уведомлений APPS-3404
 - Рецензирование:
 	* Отображение шагов для преподавателей APPS-3397
 	* UI контейнера APPS-3400
 	* Логика контейнера APPS-3402
 	* Поддержка квизов APPS-3403
-- Поиск по курсу APPS-3420
 - Регресс