Remove suffix from page name (slug)

SumOfUs · Apr 4, 2016 · b961633 · b961633
1 parent 006353c
commit b961633
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 30 deletions.
diff --git a/app/controllers/api/actions_controller.rb b/app/controllers/api/actions_controller.rb
@@ -10,7 +10,7 @@ def create
       write_member_cookie(action.member_id)
       render json: {}, status: 200
     else
-      render json: {errors: validator.errors}, status: 422
+      render json: { errors: validator.errors }, status: 422
     end
   end
 
@@ -19,7 +19,7 @@ def validate
     if validator.valid?
       render json: {}, status: 200
     else
-      render json: {errors: validator.errors}, status: 422
+      render json: { errors: validator.errors }, status: 422
     end
   end
 
@@ -38,4 +38,3 @@ def fields
     Form.find(params[:form_id]).form_elements.map(&:name)
   end
 end
-
diff --git a/app/services/action_queue.rb b/app/services/action_queue.rb
@@ -44,7 +44,7 @@ def payload
       {
         type: 'action',
         params: {
-          page: "#{@action.page.slug}-petition"
+          page: page.slug,
         }.merge(@action.form_data).
           merge( UserLanguageISO.for(page.language) ).tap do |params|
             params[:country] = country(member.country) if member.country.present?
@@ -61,7 +61,7 @@ def payload
         type:  'donation',
         params: {
           donationpage: {
-            name:             "#{@action.page.slug}-donation",
+            name: page.slug,
             payment_account:  get_payment_account
           },
           order: {

diff --git a/app/services/manage_action.rb b/app/services/manage_action.rb
@@ -13,16 +13,4 @@ def create
     return previous_action if previous_action.present?
     build_action
   end
-
-  private
-
-  def queue_message
-    {
-      type: 'action',
-      params: {
-        page: "#{page.slug}-petition"
-      }.merge(@params)
-    }
-  end
 end
-
diff --git a/spec/requests/api/actions_spec.rb b/spec/requests/api/actions_spec.rb
@@ -19,7 +19,6 @@
   let(:form) { create(:form_with_email) }
 
   describe "POST#create" do
-    let(:page) { create(:page) }
     let(:form) { create(:form_with_email_and_optional_country) }
 
     let(:params) do
@@ -37,8 +36,8 @@
         type: "action",
 
         params: {
-          page:   "#{page.slug}-petition",
-          email:  "hello@example.com",
+          page:   page.slug,
+          email:  'hello@example.com',
           page_id: page.id.to_s,
           form_id: form.id.to_s,
           source: 'fb',
@@ -170,12 +169,12 @@
               message_body: {
                   type: 'action',
                   params: {
-                      page: "#{page.slug}-petition",
-                      email: 'hello@example.com',
-                      page_id: page.id.to_s,
-                      form_id: form.id.to_s,
-                      akid: invalid_akid,
-                      user_en: 1
+                    page: page.slug,
+                    email: 'hello@example.com',
+                    page_id: page.id.to_s,
+                    form_id: form.id.to_s,
+                    akid: invalid_akid,
+                    user_en: 1
                   }
               }.to_json
           }

diff --git a/spec/requests/api/braintree_spec.rb b/spec/requests/api/braintree_spec.rb
@@ -24,7 +24,7 @@
       type: "donation",
       params: {
         donationpage: {
-          name: "cash-rules-everything-around-me-donation",
+          name: "cash-rules-everything-around-me",
           payment_account: "Braintree EUR"
         },
         order: {

diff --git a/spec/requests/api/braintree_webhook_spec.rb b/spec/requests/api/braintree_webhook_spec.rb
@@ -93,7 +93,7 @@
             type: "donation",
             params: {
               donationpage: {
-                name: "cash-rules-everything-around-me-donation",
+                name: "cash-rules-everything-around-me",
                 payment_account: "Braintree EUR"
               },
               order: {
@@ -153,7 +153,7 @@
             type: "donation",
             params: {
               donationpage: {
-                name: "cash-rules-everything-around-me-donation",
+                name: "cash-rules-everything-around-me",
                 payment_account: "PayPal EUR"
               },
               order: {

diff --git a/spec/services/manage_action_spec.rb b/spec/services/manage_action_spec.rb
@@ -26,7 +26,7 @@
       expected = {
         type: "action",
         params: {
-          page:           "#{page.slug}-petition",
+          page:           page.slug,
           email:          "bob@example.com",
           page_id:        page.id,
           referring_akid: '123.456.xyz',