fix(*): rebases branch and fixes merge conflicts

openSUSE · Jun 28, 2018 · 6da746e · 6da746e
1 parent decf97c
commit 6da746e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/cli.rb b/lib/cli.rb
@@ -365,7 +365,7 @@ def cleanup_sprint
       planning_board: boards.planning_board(board_from_id(options['board-id'])),
       target_board: board_from_id(options['target-board-id'])
     )
-    s.cleanup(options['set-last-sprint-label'])
+    s.cleanup(set_last_sprint_label: options['set-last-sprint-label'])
   end
 
   desc 'move-backlog', 'Move the planning backlog to the sprint board'

diff --git a/spec/unit/scrum/sprint_cleaner_spec.rb b/spec/unit/scrum/sprint_cleaner_spec.rb
@@ -65,9 +65,9 @@
     end
   end
 
-  context 'with named parameter not given', :focus do
+  context 'with named parameter not given' do
     it 'should raise ArgumentError' do
-      expect { subject.cleanup('7Zar7bNm', '72tOJsGS', true) }.to raise_error(ArgumentError)
+      expect { subject.cleanup(true) }.to raise_error(ArgumentError)
     end
   end