fixed conflict

spec/routing/membership_actions_routing_spec.rb

@@ -0,0 +1,39 @@
+require "rails_helper"
+
+RSpec.describe MembershipActionsController, type: :routing do
+  describe "routing" do
+
+    it "routes to #index" do
+      expect(:get => "/membership_actions").to route_to("membership_actions#index")
+    end
+
+    it "routes to #new" do
+      expect(:get => "/membership_actions/new").to route_to("membership_actions#new")
+    end
+
+    it "routes to #show" do
+      expect(:get => "/membership_actions/1").to route_to("membership_actions#show", :id => "1")
+    end
+
+    it "routes to #edit" do
+      expect(:get => "/membership_actions/1/edit").to route_to("membership_actions#edit", :id => "1")
+    end
+
+    it "routes to #create" do
+      expect(:post => "/membership_actions").to route_to("membership_actions#create")
+    end
+
+    it "routes to #update via PUT" do
+      expect(:put => "/membership_actions/1").to route_to("membership_actions#update", :id => "1")
+    end
+
+    it "routes to #update via PATCH" do
+      expect(:patch => "/membership_actions/1").to route_to("membership_actions#update", :id => "1")
+    end
+
+    it "routes to #destroy" do
+      expect(:delete => "/membership_actions/1").to route_to("membership_actions#destroy", :id => "1")
+    end
+
+  end
+end

spec/routing/settings/membership_actions_routing_spec.rb

@@ -0,0 +1,39 @@
+require "rails_helper"
+
+RSpec.describe Settings::MembershipActionsController, type: :routing do
+  describe "routing" do
+
+    it "routes to #index" do
+      expect(:get => "/settings/membership_actions").to route_to("settings/membership_actions#index")
+    end
+
+    it "routes to #new" do
+      expect(:get => "/settings/membership_actions/new").to route_to("settings/membership_actions#new")
+    end
+
+    it "routes to #show" do
+      expect(:get => "/settings/membership_actions/1").to route_to("settings/membership_actions#show", :id => "1")
+    end
+
+    it "routes to #edit" do
+      expect(:get => "/settings/membership_actions/1/edit").to route_to("settings/membership_actions#edit", :id => "1")
+    end
+
+    it "routes to #create" do
+      expect(:post => "/settings/membership_actions").to route_to("settings/membership_actions#create")
+    end
+
+    it "routes to #update via PUT" do
+      expect(:put => "/settings/membership_actions/1").to route_to("settings/membership_actions#update", :id => "1")
+    end
+
+    it "routes to #update via PATCH" do
+      expect(:patch => "/settings/membership_actions/1").to route_to("settings/membership_actions#update", :id => "1")
+    end
+
+    it "routes to #destroy" do
+      expect(:delete => "/settings/membership_actions/1").to route_to("settings/membership_actions#destroy", :id => "1")
+    end
+
+  end
+end