Merge branch 'v2' of https://github.com/TheSoftwareDesignLab/KrakenMobile

Author: ravelinx22

calabash-android-features-skeleton/step_definitions/kraken_steps.rb

@@ -0,0 +1 @@
+require 'kraken-mobile/steps/mobile/kraken_steps'

calabash-android-features-skeleton/step_definitions/mobile_steps.rb

@@ -1,13 +1,11 @@
 require 'calabash-android/management/app_installation'
 
-AfterConfiguration do |_config|
+AfterConfiguration do |config|
   FeatureMemory.feature = nil
 end
 
 Before do |scenario|
-  scenario = scenario.scenario_outline if scenario.respond_to?(
-    :scenario_outline
-  )
+  scenario = scenario.scenario_outline if scenario.respond_to?(:scenario_outline)
 
   feature = scenario.feature
   if FeatureMemory.feature != feature || ENV['RESET_BETWEEN_SCENARIOS'] == '1'
@@ -16,6 +14,8 @@
     else
       log 'First scenario in feature - reinstalling apps'
     end
+
+    ensure_app_installed
     clear_app_data
     FeatureMemory.feature = feature
     FeatureMemory.invocation = 1

calabash-android-features-skeleton/support/app_installation_hooks.rb

@@ -1,11 +1,9 @@
-require 'kraken-mobile/runners/calabash/android/operations'
+require 'kraken-mobile/hooks/mobile_operations'
 
 Before do |scenario|
-  start_kraken_test_server_in_background scenario
-  @scenario_tags
+  start_test_kraken_server_in_background
 end
 
 After do |scenario|
-  shutdown_kraken_test_server scenario
-  uninstall_app_with_calabash
+  shutdown_test_kraken_server
 end

calabash-android-features-skeleton/support/app_life_cycle_hooks.rb

@@ -1 +1 @@
-require 'kraken-mobile/runners/calabash/android/cucumber'
+require 'kraken-mobile/utils/mobile_cucumber'

calabash-android-features-skeleton/support/env.rb

@@ -0,0 +1,3 @@
+if ENV["ADB_DEVICE_ARG"].nil?
+  require 'kraken-mobile/steps/web/kraken_steps'
+end

calabash-android-features-skeleton/web/step_definitions/web_steps.rb

@@ -0,0 +1,15 @@
+if ENV["ADB_DEVICE_ARG"].nil?
+  require 'kraken-mobile/hooks/web_operations'
+
+  Before do |scenario|
+    start_test_kraken_server_in_background(
+      scenario: scenario
+    )
+  end
+
+  After do |scenario|
+    shutdown_test_kraken_server(
+      scenario: scenario
+    )
+  end
+end

calabash-android-features-skeleton/web/support/app_life_cycle_hooks.rb

@@ -86,7 +86,7 @@ def save_key_value_in_dictionary(key:, value:)
   # Generators
   #-------------------------------
   def generate_name
-    Faker::Name.name
+    Faker::Name.first_name
   end
 
   def generate_number

lib/kraken-mobile/helpers/kraken_faker.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KrakenMobile
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end