Upgrade to Rails 5.2upgrade-rails-5-2-ce

Updates changed method names and fixes spec failures

3 files changed, 5 insertions, 5 deletions

diff --git a/spec/models/cycle_analytics/issue_spec.rb b/spec/models/cycle_analytics/issue_spec.rb
index 7b18e24a351..4ccbdf29df6 100644
--- a/spec/models/cycle_analytics/issue_spec.rb
+++ b/spec/models/cycle_analytics/issue_spec.rb
@@ -24,7 +24,7 @@ describe 'CycleAnalytics#issue' do
                             ["list label added to issue",
                              -> (context, data) do
                                if data[:issue].persisted?
-                                 data[:issue].update(label_ids: [context.create(:label, lists: [context.create(:list)]).id])
+                                 data[:issue].update(label_ids: [context.create(:list).label_id])
                                end
                              end]],
     post_fn: -> (context, data) do
diff --git a/spec/models/cycle_analytics/plan_spec.rb b/spec/models/cycle_analytics/plan_spec.rb
index 73fc98ba6cf..c99c38e9cf3 100644
--- a/spec/models/cycle_analytics/plan_spec.rb
+++ b/spec/models/cycle_analytics/plan_spec.rb
@@ -25,7 +25,7 @@ describe 'CycleAnalytics#plan' do
                              end],
                             ["list label added to issue",
                              -> (context, data) do
-                               data[:issue].update(label_ids: [context.create(:label, lists: [context.create(:list)]).id])
+                               data[:issue].update(label_ids: [context.create(:list).label_id])
                              end]],
     end_time_conditions:   [["issue mentioned in a commit",
                              -> (context, data) do
diff --git a/spec/models/issue/metrics_spec.rb b/spec/models/issue/metrics_spec.rb
index 07858fe8a70..7aa0d97b194 100644
--- a/spec/models/issue/metrics_spec.rb
+++ b/spec/models/issue/metrics_spec.rb
@@ -32,7 +32,7 @@ describe Issue::Metrics do
 
     context "list labels" do
       it "records the first time an issue is associated with a list label" do
-        list_label = create(:label, lists: [create(:list)])
+        list_label = create(:list).label
         time = Time.now
         Timecop.freeze(time) { subject.update(label_ids: [list_label.id]) }
         metrics = subject.metrics
@@ -43,9 +43,9 @@ describe Issue::Metrics do
 
       it "does not record the second time an issue is associated with a list label" do
         time = Time.now
-        first_list_label = create(:label, lists: [create(:list)])
+        first_list_label = create(:list).label
         Timecop.freeze(time) { subject.update(label_ids: [first_list_label.id]) }
-        second_list_label = create(:label, lists: [create(:list)])
+        second_list_label = create(:list).label
         Timecop.freeze(time + 5.hours) { subject.update(label_ids: [second_list_label.id]) }
         metrics = subject.metrics