Fix doctor version checks for pro package and dedupe wildcard errors

cursoragent · cursoragent · commit 060361f0e2c3 · 2026-04-05T03:23:02.000Z
diff --git a/react_on_rails/lib/react_on_rails/doctor.rb b/react_on_rails/lib/react_on_rails/doctor.rb
@@ -142,9 +142,8 @@ def check_environment
     end
 
     def check_react_on_rails_versions
-      # Use system_checker for comprehensive package validation instead of duplicating
+      # SystemChecker already validates wildcard/version-pattern constraints.
       checker.check_react_on_rails_packages
-      check_version_wildcards
       check_pro_package_consistency
       auto_fix_versions if fix
     end
@@ -565,8 +564,13 @@ def check_npm_wildcard_for(all_deps, package_name)
       return unless npm_version
 
       if /[~^><*]/.match?(npm_version) || npm_version.include?(" ")
+        gem_version = if package_name == "react-on-rails-pro"
+                        ReactOnRails::Utils.react_on_rails_pro_version
+                      else
+                        ReactOnRails::VERSION
+                      end
         install_cmd = ReactOnRails::Utils.package_manager_install_exact_command(
-          package_name, ReactOnRails::VersionSyntaxConverter.new.rubygem_to_npm(ReactOnRails::VERSION)
+          package_name, ReactOnRails::VersionSyntaxConverter.new.rubygem_to_npm(gem_version)
         )
         checker.add_error(<<~MSG.strip)
           🚫 package.json uses a non-exact version for #{package_name}: #{npm_version}
diff --git a/react_on_rails/spec/lib/react_on_rails/doctor_spec.rb b/react_on_rails/spec/lib/react_on_rails/doctor_spec.rb
@@ -84,6 +84,41 @@
     end
   end
 
+  describe "#check_react_on_rails_versions" do
+    let(:doctor) { described_class.new(verbose: false, fix: false) }
+    let(:checker) { doctor.instance_variable_get(:@checker) }
+
+    before do
+      allow(checker).to receive(:check_react_on_rails_packages)
+      allow(doctor).to receive(:check_pro_package_consistency)
+    end
+
+    it "relies on SystemChecker for version-pattern checks" do
+      expect(checker).to receive(:check_react_on_rails_packages)
+      expect(doctor).not_to receive(:check_version_wildcards)
+      expect(doctor).to receive(:check_pro_package_consistency)
+
+      doctor.send(:check_react_on_rails_versions)
+    end
+  end
+
+  describe "#check_npm_wildcard_for" do
+    let(:doctor) { described_class.new(verbose: false, fix: false) }
+
+    it "uses the Pro gem version in the install command for react-on-rails-pro" do
+      allow(ReactOnRails::Utils).to receive(:react_on_rails_pro_version).and_return("16.4.1")
+      expect(ReactOnRails::Utils).to receive(:package_manager_install_exact_command)
+        .with("react-on-rails-pro", "16.4.1")
+        .and_return("npm install react-on-rails-pro@16.4.1")
+
+      doctor.send(
+        :check_npm_wildcard_for,
+        { "react-on-rails-pro" => "^16.4.0" },
+        "react-on-rails-pro"
+      )
+    end
+  end
+
   describe "#check_react_on_rails_initializer" do
     let(:doctor) { described_class.new(verbose: false, fix: false) }
     let(:checker) { doctor.instance_variable_get(:@checker) }
