Add shift key detection to keyboard

Author: inancgumus

common/keyboard.go

@@ -132,23 +132,31 @@ func (k *Keyboard) insertText(text string) error {
 }
 
 func (k *Keyboard) keyDefinitionFromKey(keyString keyboardlayout.KeyInput) keyboardlayout.KeyDefinition {
-	shift := k.modifiers & ModifierKeyShift
-	keyDef := keyboardlayout.KeyDefinition{}
 	layout := keyboardlayout.GetKeyboardLayout(k.layoutName)
-	code := keyString
 	srcKeyDef, ok := layout.Keys[keyString]
-
+	// Find based on key value instead of code
 	if !ok {
-		// Find based on key value instead of code
 		for k, v := range layout.Keys {
-			if v.Key == string(keyString) {
-				code = k
-				srcKeyDef = v
-				break
+			if v.Key != string(keyString) {
+				continue
 			}
+			keyString, srcKeyDef = k, v
+			ok = true // don't look for a shift key below
 		}
 	}
+	// try to find with the shift key value
+	shift := k.modifiers & ModifierKeyShift
+	if !ok {
+		for k, v := range layout.Keys {
+			if v.ShiftKey != string(keyString) {
+				continue
+			}
+			keyString, srcKeyDef = k, v
+		}
+		shift = k.modifiers | ModifierKeyShift
+	}
 
+	var keyDef keyboardlayout.KeyDefinition
 	if srcKeyDef.Key != "" {
 		keyDef.Key = srcKeyDef.Key
 	}
@@ -164,8 +172,8 @@ func (k *Keyboard) keyDefinitionFromKey(keyString keyboardlayout.KeyInput) keybo
 	if srcKeyDef.KeyCode != 0 {
 		keyDef.KeyCode = srcKeyDef.KeyCode
 	}
-	if code != "" {
-		keyDef.Code = string(code)
+	if keyString != "" {
+		keyDef.Code = string(keyString)
 	}
 	if srcKeyDef.Location != 0 {
 		keyDef.Location = srcKeyDef.Location
@@ -176,15 +184,13 @@ func (k *Keyboard) keyDefinitionFromKey(keyString keyboardlayout.KeyInput) keybo
 	if srcKeyDef.Text != "" {
 		keyDef.Text = srcKeyDef.Text
 	}
-	if shift != 0 && keyDef.ShiftKey != "" {
-		keyDef.Text = keyDef.ShiftKey
+	if shift != 0 && srcKeyDef.ShiftKey != "" {
+		keyDef.Text = srcKeyDef.ShiftKey
 	}
-
 	// If any modifiers besides shift are pressed, no text should be sent
 	if k.modifiers & ^ModifierKeyShift != 0 {
 		keyDef.Text = ""
 	}
-
 	return keyDef
 }
 

tests/page_input_value_test.go

@@ -55,27 +55,36 @@ func testPageInputValue(t *testing.T, b api.Browser) {
 		<textarea>hello3</textarea>
      	`, nil)
 
-	value := p.InputValue("input", nil)
-	assert.Equal(t, value, "hello1")
+	got, want := p.InputValue("input", nil), "hello1"
+	assert.Equal(t, got, want)
 
-	value = p.InputValue("select", nil)
-	assert.Equal(t, value, "hello2")
+	got, want = p.InputValue("select", nil), "hello2"
+	assert.Equal(t, got, want)
 
-	value = p.InputValue("textarea", nil)
-	assert.Equal(t, value, "hello3")
+	got, want = p.InputValue("textarea", nil), "hello3"
+	assert.Equal(t, got, want)
 }
 
 // test for: https://github.com/grafana/xk6-browser/issues/132
 func testPageInputSpecialCharacters(t *testing.T, b api.Browser) {
-	const want = "test@k6.io"
-
 	p := b.NewPage(nil)
 	defer p.Close(nil)
 
-	p.SetContent(`<input id="username">`, nil)
-	el := p.Query("#username")
-	el.Type(want, nil)
+	p.SetContent(`<input id="special">`, nil)
+	el := p.Query("#special")
+
+	wants := []string{
+		"test@k6.io",
+		"<hello WoRlD \\/>",
+		"{(hello world!)}",
+		"!#$%^&*()+_|~±",
+		`¯\_(ツ)_/¯`,
+	}
+	for _, want := range wants {
+		el.Fill("", nil)
+		el.Type(want, nil)
 
-	got := el.InputValue(nil)
-	assert.Equal(t, want, got)
+		got := el.InputValue(nil)
+		assert.Equal(t, want, got)
+	}
 }